From 1c0049903dc52a824834345e3f765ef5d45dc93d Mon Sep 17 00:00:00 2001 From: Santosh Bhandary Date: Mon, 29 Nov 2021 00:17:47 +0545 Subject: [PATCH] package reformatting with bug fixing and multiple language changes --- .../10d603af2f850afbee41be58b45e1b57.bin | 0 .../14ab68a60bd5d17b26576662023034a4.bin | 0 .../14f1557aeeb62c1044b4f64c3f4885d8.bin | 1 + .../192e5272835f34667d8c3e0f3e04c609.bin | 1 + .../classes.dex | Bin 0 -> 35308 bytes .../1accfe975a32d1051d1b9b6f261e1a51.bin | 1 + .../classes.dex | Bin 0 -> 35292 bytes .../1ef27b29889adaacd4fab384e37affff.bin | 0 .../23a1176dea2ee0e02e86c3b980c84b18.bin | 0 .../2fe29ebbdf152411be4d29edb59ea011.bin | 0 .../468ac4583073e52c93e95b0cfb974ef3.bin | 0 .../5167830e3b8923effcdc0cd96138182e.bin | 1 + .../558e35a365ccc10c71f4a4c55fc42aaf.bin | 0 .../679016e4e8de97e794d6f5f1a1a0a88c.bin | 1 + .../jetified-SpinnerDatePickerLib-release.aar | Bin 0 -> 34470 bytes .../6d2e524242794464aec5dcfff8a6e26e.bin | 1 + .../6d76b6f8c6a59da15852d842e3158420.bin | 1 + .../layout_date_picker.xml.flat | Bin 0 -> 3204 bytes .../layout_date_picker_container.xml.flat | Bin 0 -> 1128 bytes .../layout_date_picker_dialog.xml.flat | Bin 0 -> 864 bytes ...yout_date_picker_dialog_container.xml.flat | Bin 0 -> 728 bytes ...ate_range_picker_dialog_container.xml.flat | Bin 0 -> 2232 bytes .../layout_number_picker_day_month.xml.flat | Bin 0 -> 1028 bytes .../layout_number_picker_year.xml.flat | Bin 0 -> 1020 bytes .../7359843e088155d35627e7a9cb53fcd4.bin | 1 + .../com.tsongkha.spinnerdatepicker-r.txt | 18 + .../77cccf497075b471419f25e241ffd354.bin | 1 + .../AndroidManifest.xml | 14 + .../R.txt | 17 + .../jars/classes.jar | Bin 0 -> 32641 bytes .../res/layout/date_picker.xml | 71 ++ .../res/layout/date_picker_container.xml | 41 + .../res/layout/date_picker_dialog.xml | 26 + .../layout/date_picker_dialog_container.xml | 8 + .../date_range_picker_dialog_container.xml | 33 + .../res/layout/number_picker_day_month.xml | 12 + .../res/layout/number_picker_year.xml | 12 + .../res/values/values.xml | 4 + .../818beb10964834f6f4eb773806274959.bin | 0 .../9d209af627d94b7249a23241412e05dc.bin | 1 + .../AndroidManifest.xml | 14 + .../SpinnerDatePickerLib-release/R.txt | 17 + .../jars/classes.jar | Bin 0 -> 32641 bytes .../res/layout/date_picker.xml | 71 ++ .../res/layout/date_picker_container.xml | 41 + .../res/layout/date_picker_dialog.xml | 26 + .../layout/date_picker_dialog_container.xml | 8 + .../date_range_picker_dialog_container.xml | 33 + .../res/layout/number_picker_day_month.xml | 12 + .../res/layout/number_picker_year.xml | 12 + .../res/values/values.xml | 4 + .../a9a8681288ebb4a462c6c6fe4e9bf6d2.bin | 1 + ...ified-SpinnerDatePickerLib-release-api.jar | Bin 0 -> 67555 bytes .../b4e20578c8fb1343712c55c2247c7940.bin | 1 + .../b84457a4f080b230b5ae49536a37455b.bin | 1 + .../c7e740d6e0f668bec674ebc36c4f51ab.bin | 1 + .../classes.dex | Bin 0 -> 35308 bytes .../e2144ca2552d8ac2163fa2c90054b6ff.bin | 1 + .../classes.dex | Bin 0 -> 35292 bytes .../e3f49486be8724183e7c0c1b235e6bb9.bin | 1 + .../classes.dex | Bin 0 -> 35292 bytes .../ea6af13514f8fa117ce06c14d98625a4.bin | 1 + ...d-SpinnerDatePickerLib-release-runtime.jar | Bin 0 -> 65034 bytes .../f764764f463ea9154284728ff743e810.bin | 1 + .../f80454cb7c70bb1bd910f4e655b10002.bin | 0 app/build.gradle | 6 +- app/google-services.json | 10 +- app/src/main/AndroidManifest.xml | 86 +- .../remit/jmecustomer/RemitApplication.java | 10 +- .../remit/jmecustomer/base/BaseActivity.java | 16 +- .../base/BaseContractInterface.java | 6 +- .../remit/jmecustomer/base/BaseFragment.java | 4 +- .../remit/jmecustomer/base/BaseGateway.java | 2 +- .../base/BaseGatewayInterface.java | 4 + .../base/BaseInteractorInterface.java | 2 +- .../remit/jmecustomer/base/BasePresenter.java | 4 +- .../base/BasePresenterInterface.java | 2 +- .../remit/jmecustomer/base/BaseViewModel.java | 4 +- .../remit/jmecustomer/base/PrefKeys.java | 2 +- .../jmecustomer/base/PrivilegedGateway.java | 14 +- .../PrivilegedGatewayDataObserverManager.java | 2 +- .../base/PrivilegedGatewayInterface.java | 4 +- .../jmecustomer/base/UIStateHandler.java | 2 +- .../customwidgets/CircularIndexView.java | 4 +- .../CurrencyFormatterTextWatcher.java | 4 +- .../customwidgets/CustomAlertDialog.java | 8 +- .../CustomAppBarLayoutBehavior.java | 2 +- .../common/customwidgets/CustomPaddingRv.java | 2 +- .../customwidgets/CustomProgressDialog.java | 4 +- .../CustomSwipeRefreshLayout.java | 2 +- .../customwidgets/DepthTransformation.java | 2 +- .../common/customwidgets/FontCache.java | 2 +- .../customwidgets/GMEFormInputField.java | 4 +- .../customwidgets/GMETextInputLayout.java | 4 +- .../GenericViewPagerAdapter.java | 2 +- .../common/customwidgets/GmeButton.java | 4 +- .../common/customwidgets/GmeEditText.java | 6 +- .../customwidgets/GmeErrorTextView.java | 4 +- .../common/customwidgets/GmeRxEditText.java | 2 +- .../customwidgets/GmeRxTextInputLayout.java | 2 +- .../HorizontalSwipeDisabledViewPager.java | 2 +- .../common/customwidgets/JmeTextView.java | 4 +- .../LineDividerItemDecoration.java | 2 +- .../customwidgets/LockableScrollView.java | 2 +- .../customwidgets/PaddedVerticalView.java | 4 +- .../customwidgets/RemitLoaderDialog.java | 4 +- .../SelectedRedBorderWithTickDecoration.java | 6 +- .../customwidgets/SwipeDisabledViewPager.java | 2 +- .../customwidgets/TextWatcherAdapter.java | 2 +- .../UserLockBottomSheetBehavior.java | 2 +- .../customwidgets/WaveProgressBarView.java | 4 +- .../customwidgets/ZoomOutTransformation.java | 2 +- .../banklistingdialog/BankIconMapper.java | 4 +- .../BankWithIconListingDialog.java | 6 +- .../common/GenericEditTextPromptDialog.java | 6 +- .../GenericImageWithTextListingDialog.java | 4 +- .../common/GenericPromptDialog.java | 19 +- .../GenericPromptDialogSingleButton.java | 165 ++++ .../common/GenericTextListingDialog.java | 4 +- .../CountryFlagMapper.java | 8 +- .../CountryListRvViewHolder.java | 4 +- .../CountryListingRvAdapter.java | 6 +- .../CountrySelectionListener.java | 4 +- .../ExchangeRateCurrencyListingDialog.java | 8 +- .../maskedittext/GmeMaskedEditText.java | 6 +- .../maskedittext/MaskedTextWatcher.java | 2 +- .../common/model/FormInputStateDTO.java | 2 +- .../common/view/AnswerInputDialog.java | 4 +- .../common/view/MAutoCompleteTextView.java | 6 +- .../common/view/MTextInputEditText.java | 6 +- .../view/MTextInputEditTextSpaceMasked.java | 8 +- .../common/view/MTextInputLayout.java | 2 +- .../common/view/MTextInputMaskedEditText.java | 10 +- .../jmecustomer/common/view/MTextView.java | 6 +- .../common/view/MaskedTextWatcher.java | 2 +- .../view/OnFragmentSelectedListener.java | 2 +- .../common/view/ValueListener.java | 2 +- .../common/view/qrscanner/BarcodeGraphic.java | 4 +- .../view/qrscanner/BarcodeGraphicTracker.java | 4 +- .../view/qrscanner/BarcodeTrackerFactory.java | 4 +- .../view/qrscanner/QRScannerFragment.java | 12 +- .../view/qrscanner/camera/MCameraSource.java | 2 +- .../camera/MCameraSourcePreview.java | 2 +- .../qrscanner/camera/MGraphicOverlay.java | 2 +- .../aboutscreen/view/AboutJMERemit.java | 49 +- .../viewModel/AboutUsInteractorInterface.java | 4 + .../viewModel/AboutUsPresenterInterface.java | 12 +- .../viewModel/AboutUsViewModel.java | 16 +- .../viewModel/AboutUsViewModelFactory.java | 2 +- .../adapter/AgentListV2RvAdapter.java | 8 +- .../gateway/AgentListV2Gateway.java | 8 +- .../agentslisting/model/AgentInfoModel.java | 2 +- .../model/AgentsListApiResponse.java | 2 +- .../agentslisting/model/BranchInfoModel.java | 2 +- .../AgentListV2InteractorInterface.java | 6 +- .../presenter/AgentListV2Presenter.java | 20 +- .../AgentListV2PresenterInterface.java | 8 +- .../view/AgentListV2Activity.java | 20 +- .../view/AgentListV2ItemViewHolder.java | 4 +- .../features/appupdate/AppUpdateActivity.java | 36 +- .../BalanceRequestViewModelFactory.java | 8 +- .../gateway/BalanceRequestGateway.java | 8 +- .../model/BalanceRequestDTO.java | 2 +- .../BalanceRequestGatewayInterface.java | 4 +- .../presenter/BalanceRequestPresenter.java | 18 +- .../BalanceRequestPresenterInterface.java | 6 +- .../view/BalanceRequestActivity.java | 14 +- .../BalanceRequestAmountPromptFragment.java | 10 +- .../view/BalanceRequestQRViewFragment.java | 10 +- .../BalanceSendViewModelFactory.java | 8 +- .../gateway/BalanceSendGateway.java | 8 +- .../model/BalanceSendConfirmDTO.java | 2 +- .../BalanceSendGatewayInterface.java | 4 +- .../presenter/BalanceSendPresenter.java | 18 +- .../BalanceSendPresenterInterface.java | 8 +- .../balancesend/view/BalanceSendActivity.java | 14 +- .../BalanceSendActivityActionListener.java | 2 +- .../view/BalanceSendQRScanFragment.java | 8 +- .../view/BalanceSendVerificationFragment.java | 12 +- .../view/BalanceSendVerificationLiveData.java | 6 +- .../CashPickupViewModelFactory.java | 8 +- .../gateway/CashPickupToWalletGateway.java | 8 +- .../model/CashPickupTxnDetailDTO.java | 2 +- .../CashPickupToWalletGatewayInterface.java | 4 +- .../CashPickupToWalletPresenter.java | 24 +- .../CashPickupToWalletPresenterInterface.java | 8 +- .../view/CashPickupToWalletActivity.java | 14 +- .../view/CashPickupTxnDetailFragment.java | 14 +- .../view/SearchCashPickupTxnFragment.java | 10 +- .../ChangePassNPinViewModelFactory.java | 8 +- .../gateway/ChangePassNPinGateway.java | 12 +- .../model/ChangePassNPInResponse.java | 2 +- .../ChangePassNPInV2PresenterInterface.java | 6 +- .../presenter/ChangePassNPinLiveData.java | 4 +- .../ChangePassNPinV2InteractorInterface.java | 8 +- .../presenter/ChangePassNPinViewModel.java | 23 +- .../view/ChangePassNPinActivity.java | 16 +- .../ChangePasswordViewModelFactory.java | 10 +- .../gateway/ChangePasswordV2Gateway.java | 12 +- .../ChangePasswordActivityV2APIResponse.java | 2 +- .../model/ChangeSuccessModel.java | 2 +- .../presenter/ChangePasswordLiveData.java | 4 +- .../ChangePasswordV2InteractorInterface.java | 8 +- .../presenter/ChangePasswordV2Presenter.java | 23 +- .../ChangePasswordV2PresenterInterface.java | 6 +- .../view/UserPasswordChangeV2Activity.java | 16 +- .../ChangePinViewModelFactory.java | 8 +- .../gateway/ChangePinGateway.java | 10 +- .../presenter/ChangePinLiveData.java | 4 +- .../ChangePinV2InteractorInterface.java | 6 +- .../presenter/ChangePinV2Presenter.java | 20 +- .../ChangePinV2PresenterInterface.java | 6 +- .../view/ChangeTxnPinActivity.java | 16 +- .../CustomerSupportContract.java | 4 +- .../presenter/CustomerSupportPresenter.java | 18 +- .../view/CustomerSupportFragment.java | 14 +- .../exrate/adapter/PaymentModeRvAdapter.java | 12 +- .../exrate/gateway/ExchangeRateGateway.java | 20 +- .../exrate/model/PaymentModeMapper.java | 4 +- .../model/datav2/CountryPaymentService.java | 2 +- ...tryPaymentServiceSeedValueApiResponse.java | 2 +- .../CountryPaymentServiceSeedValueModel.java | 2 +- .../ExchangeCalculationApiResponse.java | 2 +- .../datav2/ExchangeCalculationModel.java | 2 +- .../model/datav2/GenericApiResponseModel.java | 2 +- .../exrate/model/datav2/PaymentMode.java | 2 +- .../datav2/PaymentServiceApiResponse.java | 2 +- .../ExchangeRateInteractorInterface.java | 12 +- .../presenter/ExchangeRatePresenter.java | 28 +- .../ExchangeRatePresenterInterface.java | 10 +- .../exrate/view/ExchangeRateActivity.java | 26 +- .../exrate/view/PaymentModeViewHolder.java | 6 +- .../view/SelectedRedBorderDecoration.java | 6 +- .../home/HomeParentViewContractV2.java | 4 +- .../features/home/HomeViewModelFactory.java | 8 +- .../home/adapters/HomeMenuRvAdapterV2.java | 8 +- .../features/home/gateway/HomeV2Gateway.java | 20 +- .../features/home/model/AppUpdateModel.java | 2 +- .../home/model/HomeNotificationViewDTO.java | 4 +- .../home/model/HomeViewRelatedDTOV2.java | 10 +- .../features/home/model/MenuItem.java | 2 +- .../features/home/model/UserCachedState.java | 2 +- .../features/home/model/UserInfoModelV2.java | 2 +- .../home/model/UserInfoV2DataApiResponse.java | 2 +- .../presenter/HomeNotificationHandler.java | 11 +- .../presenter/HomeV2InteractorInterface.java | 10 +- .../presenter/HomeV2PresenterInterface.java | 11 +- .../home/presenter/HomeViewModel.java | 43 +- .../features/home/view/HomeActivityV2.java | 184 ++-- .../features/home/view/HomeFragmentV2.java | 68 +- .../home/view/HomeMenuItemViewHolderV2.java | 6 +- .../ChangePassNotificationView.java | 6 +- .../ChangePinNPassNotificationView.java | 6 +- .../ChangePinNotificationView.java | 6 +- .../view/notifications/DimBackgroundView.java | 2 +- .../notifications/EmailNotVerifiedView.java | 4 +- .../HomeNotificiationViewFactory.java | 5 +- .../KYCNotSubmittedNotificationView.java | 6 +- .../KYCNotVerifiedNotificationView.java | 4 +- .../notifications/NotificaitonBaseView.java | 2 +- .../TermsNotAcceptedNotificationView.java | 4 +- .../gateway/InboundRemitReceiptGateway.java | 8 +- .../model/InboundRemitTxnReceiptDTO.java | 4 +- .../InboundRemitReceiptGatewayInterface.java | 4 +- .../InboundRemitReceiptPresenterImpl.java | 20 +- ...InboundRemitReceiptPresenterInterface.java | 8 +- .../view/InboundRemitReceiptActivity.java | 14 +- .../inboundreceipt/view/ProgressPathView.java | 4 +- .../ExistingKYCV3ViewModelFactory.java | 12 +- .../gateway/ExistingExistingKYCV3Gateway.java | 25 +- .../gateway/ExistingFileDownloadGateway.java | 6 +- .../model/ExistingIDTextDTO.java | 6 +- .../model/ExistingIDTypeDTO.java | 2 +- .../model/ExistingKYCRelatedDataDTO.java | 2 +- .../model/ExistingKYCRelatedDataDTOCopy.java | 2 +- .../model/ExistingKYCRequestDataDTO.java | 2 +- .../model/ExistingNativeCountry.java | 6 +- .../model/ExistingPersonalInfoDTO.java | 4 +- .../model/ExistingPersonalInfoDTOCopy.java | 4 +- .../model/ExistingPicturesDTO.java | 4 +- .../model/ExistingPicturesDTOCopy.java | 2 +- .../model/ExistingPrimaryInformationDTO.java | 4 +- .../ExistingPrimaryInformationDTOCopy.java | 4 +- .../ExistingKYCV3GatewayInterface.java | 10 +- .../ExistingKYCV3PresenterInterface.java | 16 +- .../presenter/ExistingKYCV3ViewModel.java | 69 +- .../view/ExistingKYCV3Activity.java | 28 +- .../ExistingKYCAdditionalIDTypeFragment.java | 11 + ...istingKYCAdditionalIDTypeViewLiveData.java | 6 +- .../documents/ExistingKYCIDTypeFragment.java | 19 +- .../ExistingKYCIDTypeViewLiveData.java | 4 +- .../ExistingCustomerDetailFragment.java | 20 +- .../ExistingCustomerDetailViewLiveData.java | 6 +- .../ExistingKycTermsAndConditionFragment.java | 10 +- .../newCustomer/KYCV3ViewModelFactory.java | 12 +- .../gateway/FileDownloadGateway.java | 6 +- .../kyc/newCustomer/gateway/KYCV3Gateway.java | 26 +- .../kyc/newCustomer/model/IDTextDTO.java | 6 +- .../kyc/newCustomer/model/IDTypeDTO.java | 2 +- .../newCustomer/model/KYCRelatedDataDTO.java | 2 +- .../model/KYCRelatedDataDTOCopy.java | 2 +- .../newCustomer/model/KYCRequestDataDTO.java | 2 +- .../kyc/newCustomer/model/NativeCountry.java | 6 +- .../newCustomer/model/PersonalInfoDTO.java | 4 +- .../model/PersonalInfoDTOCopy.java | 4 +- .../kyc/newCustomer/model/PicturesDTO.java | 4 +- .../newCustomer/model/PicturesDTOCopy.java | 2 +- .../model/PrimaryInformationDTO.java | 4 +- .../model/PrimaryInformationDTOCopy.java | 4 +- .../presenter/KYCV3GatewayInterface.java | 10 +- .../presenter/KYCV3PresenterInterface.java | 16 +- .../newCustomer/presenter/KYCV3ViewModel.java | 65 +- .../kyc/newCustomer/view/KYCV3Activity.java | 30 +- .../view/documents/KYCIDTypeFragment.java | 18 +- .../view/documents/KYCIDTypeViewLiveData.java | 4 +- .../view/personal/CustomerDetailFragment.java | 27 +- .../personal/CustomerDetailViewLiveData.java | 6 +- .../NewKycTermsAndConditionFragment.java | 10 +- .../features/login/LoginViewModelFactory.java | 8 +- .../login/gateway/LoginV2Gateway.java | 16 +- .../features/login/model/LoginModelV2.java | 2 +- .../login/model/LoginV2DataApiResponse.java | 2 +- .../presenter/LoginV2InteractorInterface.java | 10 +- .../presenter/LoginV2PresenterInterface.java | 6 +- .../login/presenter/LoginV2ViewModel.java | 30 +- .../login/presenter/LoginViewLiveData.java | 4 +- .../features/login/view/LoginV2Activity.java | 69 +- .../notice/NoticeViewModelFactory.java | 8 +- .../adapter/NoticeListingRVAdapter.java | 6 +- .../adapter/NoticeListingRVViewholder.java | 4 +- .../notice/gateway/NoticeGateway.java | 12 +- .../features/notice/model/NoticeDTO.java | 2 +- .../notice/model/NoticeDetailDTO.java | 2 +- .../presenter/NoticeGatewayInterface.java | 8 +- .../presenter/NoticePresenterInterface.java | 10 +- .../notice/presenter/NoticeViewModel.java | 20 +- .../features/notice/view/NoticeActivity.java | 16 +- .../notice/view/NoticeDetailFragment.java | 10 +- .../notice/view/NoticeListingFragment.java | 17 +- .../OTPVerificationViewModelFactory.java | 8 +- .../gateway/OTPVerificationGateway.java | 8 +- .../model/OTPSubmitModelDTO.java | 2 +- .../OTPVerificationGatewayInterface.java | 4 +- .../presenter/OTPVerificationPresenter.java | 16 +- .../OTPVerificationPresenterInterface.java | 4 +- .../view/OTPRequestFragment.java | 8 +- .../view/OTPVerificationActivity.java | 16 +- .../view/OTPVerifyFragment.java | 10 +- .../RecipientAddViewModelFactory.java | 14 +- .../RecipientEditViewModelFactory.java | 10 +- .../adapter/RecipientListingRvAdapter.java | 10 +- .../RecipientAddEditGateway.java | 12 +- .../RecipientAddEditGatewayInterface.java | 10 +- .../RecipientListingGateway.java | 8 +- .../countryservice/CountryServiceModel.java | 6 +- .../countryservice/ServiceTypeModel.java | 6 +- .../dynamicvalidation/DropDownDTO.java | 2 +- .../DynamicValidationModel.java | 2 +- .../dynamicvalidation/PaymentBankModel.java | 2 +- .../PayoutProvincesModel.java | 2 +- .../ValidationRuleModel.java | 6 +- .../model/recipientlisting/AgentModel.java | 4 +- .../model/recipientlisting/BranchModel.java | 4 +- .../recipientlisting/PaymentMethodModel.java | 4 +- .../recipientlisting/ReceiverInfoModel.java | 14 +- .../RecipientRelatedDataModel.java | 2 +- .../SendMoneyRequiredData.java | 2 +- .../RecipientDetailValidatorFieldMapping.java | 2 +- .../RecipientAddContractInterface.java | 8 +- .../RecipientAddEditBaseViewModel.java | 40 +- .../RecipientDetailValidator.java | 236 ++--- .../RecipientPresenterInterface.java | 22 +- .../add/RecipientAddViewModel.java | 36 +- .../edit/RecipientEditViewModel.java | 42 +- .../RecipientListingInteractorInterface.java | 6 +- .../RecipientListingPresenter.java | 24 +- .../RecipientListingPresenterInterface.java | 12 +- .../utils/EditTextConfigurationFactory.java | 4 +- .../utils/InputFilterFactory.java | 4 +- .../utils/ValidationUtils.java | 6 +- .../BeneficiaryAddEditFragment.java | 60 +- .../BeneficiaryAddEditTermsFragment.java | 27 +- .../RecipientAddEditActivity.java | 18 +- .../RecipientBranchListingDialog.java | 24 +- .../RecipientListViewholder.java | 4 +- .../RecipientListingActivity.java | 28 +- .../RecipientModifyPromptDialog.java | 4 +- .../adapter/RecipientListingV3RvAdapter.java | 10 +- .../RecipientTermsGateway.java | 8 +- .../RecipientTermsGatewayInterface.java | 4 +- .../RecipientAddEditV3Gateway.java | 14 +- .../RecipientAddEditV3GatewayInterface.java | 10 +- .../RecipientListingV3Gateway.java | 10 +- .../countryservice/CountryServiceModel.java | 6 +- .../countryservice/ServiceTypeModel.java | 6 +- .../dynamicvalidation/DropDownDTO.java | 2 +- .../DynamicValidationModel.java | 2 +- .../dynamicvalidation/PaymentBankModel.java | 4 +- .../PayoutProvincesModel.java | 2 +- .../ValidationRuleModel.java | 6 +- .../recipientlistingV3/AgentV3Model.java | 4 +- .../recipientlistingV3/BranchV3Model.java | 4 +- .../PaymentMethodV3Model.java | 4 +- .../ReceiverInfoV3Model.java | 14 +- .../RecipientRelatedDataModelV3.java | 2 +- ...ecipientDetailValidatorFieldMappingV3.java | 2 +- .../RecipientPresenterTermsInterface.java | 13 + .../RecipientTermsViewModel.java | 26 +- .../RecipientAddEditBaseV3ViewModel.java | 44 +- .../RecipientAddV3ContractInterface.java | 17 +- .../RecipientDetailValidatorV3.java | 82 +- .../RecipientPresenterInterface.java | 23 +- .../add/RecipientAddV3ViewModel.java | 46 +- .../RecipientEditV3PresenterInterface.java | 7 + .../edit/RecipientEditV3ViewModel.java | 54 +- ...RecipientListingV3InteractorInterface.java | 6 +- .../RecipientListingV3Presenter.java | 26 +- .../RecipientListingV3PresenterInterface.java | 12 +- .../utils/EditTextConfigurationFactory.java | 4 +- .../utils/InputFilterFactory.java | 4 +- .../utils/ValidationUtils.java | 6 +- .../view/RecipientAddV3ViewModelFactory.java | 10 +- .../view/RecipientEditV3ViewModelFactory.java | 10 +- .../view/RecipientTermsViewModelFactory.java | 10 +- .../BeneficiaryAddEditV3TermsActivity.java | 27 +- .../RecipientTermsContractInterface.java | 9 + .../BeneficiaryAddEditV3Fragment.java | 66 +- .../BeneficiaryAddEditV3TermsFragment.java | 30 +- .../RecipientAddEditV3Activity.java | 16 +- .../RecipientBranchListingDialog.java | 24 +- .../RecipientListRVViewholderV3.java | 4 +- .../RecipientListingV3Activity.java | 84 +- .../RecipientModifyPromptDialog.java | 4 +- .../register/RegisterViewModelFactory.java | 10 +- .../register/gateway/RegisterV2Gateway.java | 16 +- .../register/model/RegisterApiResponse.java | 2 +- .../RegisterV2InteractorInterface.java | 10 +- .../presenter/RegisterV2Presenter.java | 38 +- .../RegisterV2PresenterInterface.java | 8 +- .../presenter/RegisterViewLiveData.java | 6 +- .../register/view/RegisterV2Activity.java | 36 +- ...stingCustomerRegisterViewModelFactory.java | 10 +- .../ExistingExistingRegisterV2Gateway.java | 18 +- ...xistingCustomerRegistrationRequestDTO.java | 2 +- .../model/ExistingRegisterApiResponse.java | 2 +- ...CustomerRegisterV2InteractorInterface.java | 10 +- ...gCustomerRegisterV2PresenterInterface.java | 6 +- .../ExistingCustomerRegisterViewModel.java | 36 +- ...ngCustomerRegistrationRequestLiveData.java | 4 +- ...ingCustomerRegistrationSubmitLiveData.java | 4 +- .../ExistingCustomerRegisterV2Activity.java | 28 +- ...ngCustomerRegistrationRequestFragment.java | 16 +- ...ingCustomerRegistrationSubmitFragment.java | 21 +- .../NewRegisterViewModelFactory.java | 10 +- .../gateway/NewRegisterV2Gateway.java | 18 +- .../model/NewRegisterApiResponse.java | 2 +- .../NewRegisterV2InteractorInterface.java | 10 +- .../presenter/NewRegisterV2Presenter.java | 37 +- .../NewRegisterV2PresenterInterface.java | 10 +- .../presenter/NewRegisterViewLiveData.java | 4 +- .../view/NewRegisterV2Activity.java | 37 +- .../renewId/RenewIdViewModelFactory.java | 12 +- .../gateway/RenewFileDownloadGateway.java | 6 +- .../renewId/gateway/RenewIdV2Gateway.java | 11 +- .../renewId/model/RenewIdRequestDataDTO.java | 4 +- .../RenewIdV2InteractorInterface.java | 8 +- .../RenewIdV2PresenterInterface.java | 12 +- .../renewId/presenter/RenewIdV2ViewModel.java | 52 +- .../presenter/RenewIdViewLiveData.java | 4 + .../renewId/view/RenewIdActivity.java | 32 +- .../renewId/view/RenewUserIdLiveData.java | 4 +- .../ResetPassViewModelFactory.java | 8 +- .../gateway/ResetPassV2Gateway.java | 10 +- .../features/resetpassword/model/Data.java | 2 +- .../resetpassword/model/ResetApiResponse.java | 2 +- .../ResetPassV2InteractorInterface.java | 8 +- .../presenter/ResetPassV2Presenter.java | 22 +- .../ResetPassV2PresenterInterface.java | 6 +- .../presenter/ResetPassViewLiveData.java | 4 +- .../view/ResetPassV2Activity.java | 18 +- .../features/security/RemitAuthManager.java | 23 +- .../features/security/RemitAuthManager1.java | 78 +- .../security/RemitAuthManagerGateway.java | 8 +- .../RemitTxnPinPromptBottomSheetDialog.java | 4 +- ...itUserPasswordPromptBottomSheetDialog.java | 4 +- .../security/model/RemitAuthFailedResult.java | 2 +- .../model/RemitAuthSuccessResult.java | 2 +- .../model/RemitBiometricEncryptionDTO.java | 2 +- .../security/model/RemitTxnParam.java | 2 +- .../security/utils/AESEncryptionHelper.java | 2 +- .../security/utils/SecurityUtils.java | 5 +- .../security/utils/SignatureCheck.java | 2 +- .../sendmoney/SendMoneyViewModelFactory.java | 10 +- ...eCurrencyListingAmountDetailRvAdapter.java | 12 +- .../PayoutModeBankListingRvAdapter.java | 10 +- .../PayoutModeBranchListingRvAdapter.java | 10 +- .../adapter/SendMoneyPayoutModeRvAdapter.java | 12 +- ...SendMoneyTransactionCompleteV2Gateway.java | 10 +- .../sendmoney/gateway/SendMoneyV2Gateway.java | 24 +- .../sendmoney/model/ExRateAPIRequestBody.java | 2 +- .../model/SendMoneyAPIRequestBody.java | 2 +- .../model/SendMoneyRequiredDataV3.java | 4 +- .../SendMoneyTransactionCompleteModel.java | 4 +- ...oneyTransactionCompleteV2ResponseBody.java | 2 +- .../SendMoneyTransactionResponseBody.java | 2 +- .../AmountDetailRelatedDataModel.java | 2 +- .../amountdetail/BranchListApiResponse.java | 4 +- .../amountdetail/RecipientCurrencyModel.java | 2 +- .../sendmoney/model/ccdi/CCDIDataDto.java | 4 +- .../AccountValidationApiResponse.java | 2 +- .../model/payoutmode/BankBranchDTO.java | 2 +- .../sendmoney/model/payoutmode/BankList.java | 2 +- .../model/payoutmode/PayoutMode.java | 2 +- .../payoutmode/PayoutModeApiResponse.java | 2 +- .../model/payoutmode/PayoutModeModel.java | 2 +- .../verification/VerificationViewModel.java | 2 +- ...nsactionCompleteV2InteractorInterface.java | 8 +- ...ndMoneyTransactionCompleteV2Presenter.java | 16 +- ...ansactionCompleteV2PresenterInterface.java | 8 +- .../SendMoneyV2InteractorInterface.java | 20 +- .../SendMoneyV2PresenterInterface.java | 29 +- .../presenter/SendMoneyV2ViewModel.java | 68 +- .../view/SendMoneyActionListener.java | 2 +- .../view/SendMoneyRequestSummaryActivity.java | 22 +- .../view/SendMoneyScreenManager.java | 14 +- .../sendmoney/view/SendMoneyV2Activity.java | 28 +- ...endMoneyV2TransactionCompleteActivity.java | 22 +- ...mountDetailExRateCountryListingDialog.java | 10 +- .../AmountDetailSendMoneyFragment.java | 24 +- .../ExRateCountryListRvViewHolder.java | 4 +- .../view/ccdi/CCDISendMoneyFragment.java | 20 +- .../view/ccdi/CCIDDetailViewLiveData.java | 6 +- .../consent/UserConsentSendMoneyFragment.java | 16 +- .../PayoutModeBankListingDialog.java | 10 +- .../PayoutModeBankListingRvViewHolder.java | 4 +- .../PayoutModeBranchListingDialog.java | 22 +- .../PayoutModeBranchListingRvViewHolder.java | 4 +- .../PayoutModeSendMoneyFragment.java | 32 +- .../SendMoneyPayoutModeRVViewHolder.java | 4 +- .../TermsAndConditionV2BrowserActivity.java | 6 +- .../VerificationSendMoneyFragment.java | 23 +- .../FingerPrintSetupModelFactory.java | 11 +- .../LanguageSelectionDialogRVAdapter.java | 10 +- .../gateway/FingerPrintSetUpGateway.java | 16 + .../gateway/LanguageSelectionGateway.java | 24 +- .../LanguageSelectionGatewayInterface.java | 4 +- .../model/FingerPrintSetupRequestModel.java | 2 +- .../model/FingerPrintSetupResponse.java | 2 +- .../view/FingerSetUpPasswordFragment.java | 65 +- .../view/FingerprintEnablePromptActivity.java | 18 +- .../LanguageSelectionDialogItemHolder.java | 4 +- .../view/LanguageSelectionListingDialog.java | 10 +- .../features/settings/view/SettingsView.java | 68 +- .../FingerPrintSetupInteractorInterface.java | 18 + .../FingerPrintSetupPresenterInterface.java | 9 +- .../viewModel/FingerSetupLiveData.java | 4 +- .../viewModel/FingerSetupViewModel.java | 26 +- .../adapter/LanguageSelectionRVAdapter.java | 10 +- .../adapter/PayoutModeSelectionRVAdapter.java | 10 +- .../adapter/ViewPagerAVDSplashAdapter.java | 2 +- .../gateway/SplashScreenGateway.java | 20 +- .../splashscreen/model/LanguageModel.java | 2 +- .../SplashScreenInteractorInterface.java | 12 +- .../presenter/SplashScreenPresenter.java | 16 +- .../SplashScreenPresenterInterface.java | 8 +- .../view/LanguageSelectionItemViewHolder.java | 6 +- .../PayoutModeSelectionItemViewHolder.java | 6 +- .../splashscreen/view/SplashScreen.java | 50 +- .../view/avdfrags/SplashAVD1Fragment.java | 4 +- .../view/avdfrags/SplashAVD2Fragment.java | 4 +- .../view/avdfrags/SplashAVD3Fragment.java | 4 +- .../SplashAnimatedViewPagerFragment.java | 6 +- .../gateway/SupportActivityV2Gateway.java | 10 +- .../model/SupportActivityV2APIResponse.java | 2 +- .../support/model/SupportSuccessModel.java | 2 +- .../SupportActivityV2InteractorInterface.java | 8 +- .../presenter/SupportActivityV2Presenter.java | 18 +- .../SupportActivityV2PresenterInterface.java | 6 +- .../support/view/SupportActivityV2.java | 14 +- .../TermsAndConditionViewModelFactory.java | 8 +- .../gateway/TermsAndConditionGateway.java | 8 +- .../termsandcondition/model/TermsDTO.java | 2 +- .../TermsAndConditionInteractorInterface.java | 6 +- .../TermsAndConditionPresenterInterface.java | 10 +- .../presenter/TermsAndConditionViewModel.java | 22 +- .../view/TermsAndConditionAcitivity.java | 22 +- .../view/TermsAndConditionFragment.java | 8 +- .../view/WebViewPDFFragment.java | 6 +- .../RemitTransactionViewModelFactory.java | 8 +- .../gateway/TransactionHistoryV2Gateway.java | 12 +- ...lInboundTransactionHistoryAPIResponse.java | 2 +- ...nalInboundTransactionHistoryItemModel.java | 2 +- ...OutboundTransactionHistoryAPIResponse.java | 2 +- ...alOutboundTransactionHistoryItemModel.java | 2 +- .../InternationalTransactionHistoryDTO.java | 2 +- ...ansactionHistoryV2InteractorInterface.java | 10 +- .../TransactionHistoryV2Presenter.java | 16 +- ...ransactionHistoryV2PresenterInterface.java | 10 +- .../view/RemitTransactionHistoryActivity.java | 16 +- .../TransactionHistoryV2ActionListener.java | 4 +- ...boundTransactionHistoryTypeFragmentV2.java | 22 +- ...boundTransactionHistoryTypeFragmentV2.java | 16 +- ...TransactionHistoryContainerFragmentV2.java | 22 +- .../TransactionItemViewHolder.java | 6 +- ...nalInboundTransactionHistoryRVAdapter.java | 12 +- ...alOutboundTransactionHistoryRVAdapter.java | 10 +- .../TransactionHistoryViewPagerAdapter.java | 2 +- .../UserProfileViewModelFactory.java | 8 +- .../gateway/UserProfileGateway.java | 12 +- .../userprofile/model/UserProfile.java | 2 +- .../UserProfileGatewayInterface.java | 9 + .../UserProfilePresenterInterface.java | 4 +- .../presenter/UserProfilePresenterV2.java | 6 +- .../userprofile/view/ProfileActivity.java | 28 +- .../adapter/WalletStatementRVAdapter.java | 8 +- .../gateway/WalletStatmentV2Gateway.java | 10 +- .../model/WalletStatementV2APIResponse.java | 2 +- .../model/WalletStatementV2ItemModel.java | 2 +- .../WalletStatementV2InteractorInterface.java | 8 +- .../presenter/WalletStatementV2Presenter.java | 16 +- .../WalletStatementV2PresenterInterface.java | 8 +- .../view/WalletStatementItemViewHolder.java | 6 +- .../view/WalletStatementV2Activity.java | 18 +- .../webbrowser/WebBrowserFragmentV2.java | 14 +- .../webbrowser/WebBrowserV2Activity.java | 16 +- .../webbrowser/model/KeyValueData.java | 2 +- .../webbrowser/model/WebRequestModel.java | 2 +- .../withdraw/WithdrawViewModelFactory.java | 8 +- .../withdraw/gateway/WithdrawGateway.java | 8 +- .../model/WithdrawStatusResponseDTO.java | 2 +- .../presenter/WithdrawGatewayInterface.java | 4 +- .../withdraw/presenter/WithdrawPresenter.java | 26 +- .../presenter/WithdrawPresenterInterface.java | 8 +- .../withdraw/view/WithdrawActivity.java | 14 +- .../view/WithdrawAmountInputFragment.java | 10 +- .../WithdrawTransactionReviewFragment.java | 12 +- .../services/JMEFcmMessagingService.java | 6 +- .../remit/jmecustomer/utils/Constants.java | 3 +- .../remit/jmecustomer/utils/ImageUtils.java | 2 +- .../remit/jmecustomer/utils/RxUtils.java | 4 +- .../remit/jmecustomer/utils/Utils.java | 31 +- .../utils/https/APIRequestErrorReturn.java | 2 +- .../jmecustomer/utils/https/API_URL.java | 4 +- .../jmecustomer/utils/https/ApiEndpoints.java | 50 +- .../https/GenericApiObserverResponse.java | 2 +- .../https/GenericApiObserverResponseV2.java | 4 +- .../utils/https/GenericApiResponse.java | 2 +- .../utils/https/GenericResponseDataModel.java | 2 +- .../utils/https/GenericThrowable.java | 2 +- .../utils/https/HTTPConstants.java | 2 +- .../jmecustomer/utils/https/HttpClientV2.java | 8 +- .../utils/https/MessageResponseDataModel.java | 2 +- .../jmecustomer/utils/https/RestApi.java | 2 +- .../utils/https/SessionExpiredException.java | 2 +- .../https/UserSessionObserverResponse.java | 2 +- .../jmecustomer/utils/other/Utility.java | 4 +- .../base/BaseGatewayInterface.java | 4 - .../viewModel/AboutUsInteractorInterface.java | 4 - .../ExistingKYCAdditionalIDTypeFragment.java | 11 - .../RecipientPresenterTermsInterface.java | 13 - .../RecipientEditV3PresenterInterface.java | 7 - .../RecipientTermsContractInterface.java | 9 - .../presenter/RenewIdViewLiveData.java | 4 - .../gateway/FingerPrintSetUpGateway.java | 16 - .../FingerPrintSetupInteractorInterface.java | 19 - .../UserProfileGatewayInterface.java | 9 - .../main/res/layout/activity_about_jme.xml | 25 +- .../res/layout/activity_agent_list_v2.xml | 4 +- .../main/res/layout/activity_app_update.xml | 20 +- .../res/layout/activity_balance_request.xml | 2 +- .../main/res/layout/activity_balance_send.xml | 2 +- .../layout/activity_cash_pickup_to_wallet.xml | 2 +- .../activity_change_pass_n_pin_layout.xml | 38 +- .../layout/activity_change_password_v2.xml | 20 +- .../res/layout/activity_change_txn_pin.xml | 20 +- .../layout/activity_exchange_method_v2.xml | 26 +- ...activity_existing_customer_register_v2.xml | 2 +- .../activity_fingerprint_enable_prompt.xml | 12 +- app/src/main/res/layout/activity_home_v2.xml | 4 +- .../layout/activity_inbound_remit_receipt.xml | 48 +- app/src/main/res/layout/activity_invite.xml | 4 +- .../res/layout/activity_kyc_existing_v3.xml | 4 +- app/src/main/res/layout/activity_kyc_v3.xml | 4 +- app/src/main/res/layout/activity_login_v2.xml | 28 +- app/src/main/res/layout/activity_notice.xml | 2 +- .../res/layout/activity_otpverification.xml | 2 +- app/src/main/res/layout/activity_profile.xml | 47 +- .../layout/activity_recipient_add_edit.xml | 2 +- .../layout/activity_recipient_add_edit_v3.xml | 2 +- .../layout/activity_recipient_listing_v3.xml | 8 +- .../res/layout/activity_recipients_list.xml | 6 +- .../main/res/layout/activity_register_v2.xml | 41 +- .../res/layout/activity_renew_id_layout.xml | 28 +- .../res/layout/activity_reset_pass_v2.xml | 18 +- .../res/layout/activity_reward_points.xml | 6 +- .../res/layout/activity_send_money_v2.xml | 2 +- ...ity_send_money_v2_transaction_complete.xml | 86 +- app/src/main/res/layout/activity_settings.xml | 8 +- .../layout/activity_splash_screen_key_0.xml | 36 +- .../layout/activity_splash_screen_key_1.xml | 12 +- .../layout/activity_splash_screen_key_2.xml | 12 +- .../main/res/layout/activity_support_v2.xml | 10 +- ...activity_terms_and_condition_acitivity.xml | 2 +- .../layout/activity_wallet_statement_v2.xml | 4 +- .../res/layout/activity_web_browser_v2.xml | 4 +- app/src/main/res/layout/activity_withdraw.xml | 2 +- .../main/res/layout/agent_info_item_view.xml | 10 +- .../main/res/layout/alert_example_layout.xml | 2 +- ...e_with_text_listing_dialog_item_layout.xml | 2 +- .../main/res/layout/banklist_item_view.xml | 2 +- .../confirm_recipient_modify_bottom_sheet.xml | 4 +- .../main/res/layout/countrylist_item_view.xml | 2 +- .../main/res/layout/dialog_answer_input.xml | 10 +- .../main/res/layout/dialog_branch_listing.xml | 10 +- .../main/res/layout/dialog_common_error.xml | 8 +- .../res/layout/dialog_country_listing.xml | 10 +- .../layout/dialog_generci_edittext_prompt.xml | 12 +- .../main/res/layout/dialog_generic_prompt.xml | 55 +- .../dialog_generic_prompt_single_button.xml | 62 ++ .../dialog_generic_text_listing_layout.xml | 8 +- .../exchange_paymentmode_rv_viewholder.xml | 4 +- .../finger_setup_pass_layout_fragment.xml | 10 +- .../fragment_amount_detail_send_money_v2.xml | 22 +- ...fragment_balance_request_amount_prompt.xml | 10 +- .../fragment_balance_send_verification.xml | 20 +- .../layout/fragment_beneficiary_add_edit.xml | 152 +-- .../fragment_beneficiary_add_edit_v3.xml | 161 ++- .../fragment_cash_pickup_txn_detail.xml | 46 +- .../layout/fragment_ccdi_send_money_v2.xml | 14 +- .../res/layout/fragment_customer_support.xml | 8 +- ...existing_customer_registration_request.xml | 26 +- ..._existing_customer_registration_submit.xml | 42 +- .../fragment_existing_kyc_customer_detail.xml | 62 +- .../layout/fragment_existing_kyc_document.xml | 22 +- app/src/main/res/layout/fragment_home_v3.xml | 40 +- ...ernational_transaction_history_type_v2.xml | 6 +- .../layout/fragment_kyc_customer_detail.xml | 62 +- .../main/res/layout/fragment_kyc_document.xml | 44 +- .../res/layout/fragment_notice_detail.xml | 6 +- .../main/res/layout/fragment_otp_request.xml | 12 +- .../main/res/layout/fragment_otp_verify.xml | 6 +- .../fragment_payout_mode_send_money_v2.xml | 10 +- .../res/layout/fragment_qr_scanner_view.xml | 6 +- .../fragment_search_cash_pickup_txn.xml | 10 +- .../layout/fragment_splash_avd_viewpager.xml | 2 +- .../layout/fragment_terms_and_condition.xml | 6 +- .../res/layout/fragment_transaction_v2.xml | 2 +- .../layout/fragment_user_consent_layout.xml | 2 +- .../fragment_verification_send_money_v2.xml | 56 +- .../res/layout/fragment_web_browser_v2.xml | 2 +- .../layout/fragment_withdraw_amount_input.xml | 10 +- .../layout/fragment_withdraw_txn_review.xml | 20 +- ...e_with_text_listing_dialog_item_layout.xml | 2 +- ...eneric_text_listing_dialog_item_layout.xml | 2 +- .../res/layout/gme_user_pwd_prompt_modal.xml | 10 +- app/src/main/res/layout/home_menu_item_v2.xml | 4 +- app/src/main/res/layout/item_invite.xml | 12 +- .../res/layout/jme_txn_pin_prompt_modal.xml | 26 +- app/src/main/res/layout/kyc_header.xml | 12 +- .../res/layout/language_selection_dialog.xml | 10 +- .../language_selection_dialog_item_view.xml | 2 +- .../layout/layout_alert_camera_gallery.xml | 8 +- .../main/res/layout/layout_bottom_tab_bar.xml | 10 +- .../main/res/layout/layout_invite_toolbar.xml | 4 +- .../layout/layout_reward_points_toolbar.xml | 4 +- .../res/layout/layout_sendmoney_toolbar.xml | 4 +- .../main/res/layout/nav_drawer_fragment.xml | 28 +- .../res/layout/notice_list_viewholder_v3.xml | 6 +- .../notification_auto_debit_required.xml | 4 +- .../res/layout/recipient_list_item_v3.xml | 12 +- app/src/main/res/layout/send_money_header.xml | 16 +- .../send_money_request_summary_layout.xml | 66 +- .../layout/send_paymentmode_rv_viewholder.xml | 4 +- ...ash_exchange_paymentmode_rv_viewholder.xml | 2 +- .../splash_language_selection_item_view.xml | 2 +- app/src/main/res/layout/tab_tran_history1.xml | 4 +- app/src/main/res/layout/tab_tran_history2.xml | 4 +- .../res/layout/toolbar_generic_with_cs.xml | 2 +- .../transaction_history_viewholder_v3.xml | 12 +- .../layout/wallet_statement_viewholder_v2.xml | 10 +- app/src/main/res/values-bn/strings.xml | 10 +- app/src/main/res/values-ja/strings.xml | 932 +++++++++--------- app/src/main/res/values-ne/strings.xml | 52 +- app/src/main/res/values-vi/strings.xml | 10 +- app/src/main/res/values/strings.xml | 71 +- .../remit/jmecustomer/ExampleUnitTest.java | 2 +- .../HomeNotificationHandlerTest.java | 13 +- .../com/remit/jmecustomer/UtilityTest.java | 7 + .../remit/jmecustomer/ValidationRuleTest.java | 4 +- .../remit/jmecustomer/UtilityTest.java | 7 - 790 files changed, 5674 insertions(+), 4909 deletions(-) create mode 100644 SpinnerDatePickerLib-release/build/.transforms/10d603af2f850afbee41be58b45e1b57.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/14ab68a60bd5d17b26576662023034a4.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/14f1557aeeb62c1044b4f64c3f4885d8.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/192e5272835f34667d8c3e0f3e04c609.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/192e5272835f34667d8c3e0f3e04c609/jetified-SpinnerDatePickerLib-release-runtime/classes.dex create mode 100644 SpinnerDatePickerLib-release/build/.transforms/1accfe975a32d1051d1b9b6f261e1a51.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/1accfe975a32d1051d1b9b6f261e1a51/jetified-SpinnerDatePickerLib-release-runtime/classes.dex create mode 100644 SpinnerDatePickerLib-release/build/.transforms/1ef27b29889adaacd4fab384e37affff.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/23a1176dea2ee0e02e86c3b980c84b18.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/2fe29ebbdf152411be4d29edb59ea011.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/468ac4583073e52c93e95b0cfb974ef3.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/5167830e3b8923effcdc0cd96138182e.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/558e35a365ccc10c71f4a4c55fc42aaf.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/679016e4e8de97e794d6f5f1a1a0a88c.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/679016e4e8de97e794d6f5f1a1a0a88c/jetified-SpinnerDatePickerLib-release.aar create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d2e524242794464aec5dcfff8a6e26e.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog.xml.flat create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_number_picker_day_month.xml.flat create mode 100644 SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat create mode 100644 SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4/com.tsongkha.spinnerdatepicker-r.txt create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/R.txt create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/jars/classes.jar create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/values/values.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/818beb10964834f6f4eb773806274959.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/AndroidManifest.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/R.txt create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/jars/classes.jar create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_container.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_year.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/values/values.xml create mode 100644 SpinnerDatePickerLib-release/build/.transforms/a9a8681288ebb4a462c6c6fe4e9bf6d2.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/a9a8681288ebb4a462c6c6fe4e9bf6d2/jetified-SpinnerDatePickerLib-release-api.jar create mode 100644 SpinnerDatePickerLib-release/build/.transforms/b4e20578c8fb1343712c55c2247c7940.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/b84457a4f080b230b5ae49536a37455b.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/c7e740d6e0f668bec674ebc36c4f51ab.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/c7e740d6e0f668bec674ebc36c4f51ab/jetified-SpinnerDatePickerLib-release-runtime/classes.dex create mode 100644 SpinnerDatePickerLib-release/build/.transforms/e2144ca2552d8ac2163fa2c90054b6ff.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/e2144ca2552d8ac2163fa2c90054b6ff/jetified-SpinnerDatePickerLib-release-runtime/classes.dex create mode 100644 SpinnerDatePickerLib-release/build/.transforms/e3f49486be8724183e7c0c1b235e6bb9.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/e3f49486be8724183e7c0c1b235e6bb9/jetified-SpinnerDatePickerLib-release-runtime/classes.dex create mode 100644 SpinnerDatePickerLib-release/build/.transforms/ea6af13514f8fa117ce06c14d98625a4.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/ea6af13514f8fa117ce06c14d98625a4/jetified-SpinnerDatePickerLib-release-runtime.jar create mode 100644 SpinnerDatePickerLib-release/build/.transforms/f764764f463ea9154284728ff743e810.bin create mode 100644 SpinnerDatePickerLib-release/build/.transforms/f80454cb7c70bb1bd910f4e655b10002.bin rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/RemitApplication.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BaseActivity.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BaseContractInterface.java (67%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BaseFragment.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BaseGateway.java (93%) create mode 100644 app/src/main/java/com/remit/jmecustomer/base/BaseGatewayInterface.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BaseInteractorInterface.java (50%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BasePresenter.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BasePresenterInterface.java (73%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/BaseViewModel.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/PrefKeys.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/PrivilegedGateway.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/PrivilegedGatewayDataObserverManager.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/PrivilegedGatewayInterface.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/base/UIStateHandler.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/CircularIndexView.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/CurrencyFormatterTextWatcher.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/CustomAlertDialog.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/CustomAppBarLayoutBehavior.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/CustomPaddingRv.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/CustomProgressDialog.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/CustomSwipeRefreshLayout.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/DepthTransformation.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/FontCache.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GMEFormInputField.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GMETextInputLayout.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GenericViewPagerAdapter.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GmeButton.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GmeEditText.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GmeErrorTextView.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GmeRxEditText.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/GmeRxTextInputLayout.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/HorizontalSwipeDisabledViewPager.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/JmeTextView.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/LineDividerItemDecoration.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/LockableScrollView.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/PaddedVerticalView.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/SelectedRedBorderWithTickDecoration.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/SwipeDisabledViewPager.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/TextWatcherAdapter.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/UserLockBottomSheetBehavior.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/WaveProgressBarView.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/ZoomOutTransformation.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/banklistingdialog/BankIconMapper.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/common/GenericImageWithTextListingDialog.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/common/GenericPromptDialog.java (90%) create mode 100644 app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericPromptDialogSingleButton.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/common/GenericTextListingDialog.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountrySelectionListener.java (61%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/maskedittext/GmeMaskedEditText.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/customwidgets/maskedittext/MaskedTextWatcher.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/model/FormInputStateDTO.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/AnswerInputDialog.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/MAutoCompleteTextView.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/MTextInputEditText.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/MTextInputEditTextSpaceMasked.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/MTextInputLayout.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/MTextInputMaskedEditText.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/MTextView.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/MaskedTextWatcher.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/OnFragmentSelectedListener.java (60%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/ValueListener.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/qrscanner/BarcodeGraphic.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/qrscanner/BarcodeGraphicTracker.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/qrscanner/BarcodeTrackerFactory.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/qrscanner/QRScannerFragment.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/qrscanner/camera/MCameraSource.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/qrscanner/camera/MCameraSourcePreview.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/common/view/qrscanner/camera/MGraphicOverlay.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java (76%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsPresenterInterface.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModel.java (66%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModelFactory.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/adapter/AgentListV2RvAdapter.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java (53%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/model/AgentInfoModel.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/model/AgentsListApiResponse.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/model/BranchInfoModel.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/presenter/AgentListV2InteractorInterface.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/presenter/AgentListV2Presenter.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/presenter/AgentListV2PresenterInterface.java (53%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/agentslisting/view/AgentListV2ItemViewHolder.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/appupdate/AppUpdateActivity.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/BalanceRequestViewModelFactory.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/gateway/BalanceRequestGateway.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/model/BalanceRequestDTO.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestGatewayInterface.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenter.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenterInterface.java (70%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java (78%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/view/BalanceRequestAmountPromptFragment.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancerequest/view/BalanceRequestQRViewFragment.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/BalanceSendViewModelFactory.java (65%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/gateway/BalanceSendGateway.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/model/BalanceSendConfirmDTO.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/presenter/BalanceSendGatewayInterface.java (73%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenterInterface.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/view/BalanceSendActivityActionListener.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/view/BalanceSendQRScanFragment.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationFragment.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationLiveData.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/CashPickupViewModelFactory.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/gateway/CashPickupToWalletGateway.java (77%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/model/CashPickupTxnDetailDTO.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletGatewayInterface.java (72%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenterInterface.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupToWalletActivity.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/cashpickuptowallet/view/SearchCashPickupTxnFragment.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/ChangePassNPinViewModelFactory.java (63%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/gateway/ChangePassNPinGateway.java (67%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/model/ChangePassNPInResponse.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPInV2PresenterInterface.java (65%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinLiveData.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinV2InteractorInterface.java (68%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/ChangePasswordViewModelFactory.java (61%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/gateway/ChangePasswordV2Gateway.java (63%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/model/ChangePasswordActivityV2APIResponse.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/model/ChangeSuccessModel.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/presenter/ChangePasswordLiveData.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2InteractorInterface.java (60%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2PresenterInterface.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changepassword/view/UserPasswordChangeV2Activity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changetxnpin/ChangePinViewModelFactory.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changetxnpin/gateway/ChangePinGateway.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changetxnpin/presenter/ChangePinLiveData.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2InteractorInterface.java (69%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2PresenterInterface.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/customersupport/CustomerSupportContract.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/customersupport/presenter/CustomerSupportPresenter.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/adapter/PaymentModeRvAdapter.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/gateway/ExchangeRateGateway.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/PaymentModeMapper.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentService.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueApiResponse.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueModel.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationApiResponse.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationModel.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/GenericApiResponseModel.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/PaymentMode.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/model/datav2/PaymentServiceApiResponse.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/presenter/ExchangeRateInteractorInterface.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenter.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenterInterface.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/view/ExchangeRateActivity.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/view/PaymentModeViewHolder.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/exrate/view/SelectedRedBorderDecoration.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/HomeParentViewContractV2.java (78%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/HomeViewModelFactory.java (75%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/adapters/HomeMenuRvAdapterV2.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/model/AppUpdateModel.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/model/HomeNotificationViewDTO.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/model/HomeViewRelatedDTOV2.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/model/MenuItem.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/model/UserCachedState.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/model/UserInfoModelV2.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/model/UserInfoV2DataApiResponse.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/presenter/HomeV2InteractorInterface.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java (78%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/presenter/HomeViewModel.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/HomeActivityV2.java (73%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/HomeFragmentV2.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/ChangePinNPassNotificationView.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/ChangePinNotificationView.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/DimBackgroundView.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/EmailNotVerifiedView.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/KYCNotSubmittedNotificationView.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/KYCNotVerifiedNotificationView.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/NotificaitonBaseView.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/home/view/notifications/TermsNotAcceptedNotificationView.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/inboundreceipt/gateway/InboundRemitReceiptGateway.java (56%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/inboundreceipt/model/InboundRemitTxnReceiptDTO.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java (67%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java (56%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/inboundreceipt/view/ProgressPathView.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/ExistingKYCV3ViewModelFactory.java (60%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingExistingKYCV3Gateway.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingFileDownloadGateway.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTextDTO.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTypeDTO.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTO.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTOCopy.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRequestDataDTO.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingNativeCountry.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTO.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTOCopy.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTO.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTOCopy.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTO.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTOCopy.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3GatewayInterface.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java (88%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeViewLiveData.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeViewLiveData.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailViewLiveData.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/KYCV3ViewModelFactory.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/gateway/FileDownloadGateway.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/IDTextDTO.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/IDTypeDTO.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTO.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTOCopy.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/KYCRequestDataDTO.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTO.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTOCopy.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTO.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTOCopy.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTO.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTOCopy.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3GatewayInterface.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java (77%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/view/KYCV3Activity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeViewLiveData.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailViewLiveData.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/kyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/LoginViewModelFactory.java (66%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/gateway/LoginV2Gateway.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/model/LoginModelV2.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/model/LoginV2DataApiResponse.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/presenter/LoginV2InteractorInterface.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/presenter/LoginV2PresenterInterface.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/presenter/LoginViewLiveData.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/login/view/LoginV2Activity.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/NoticeViewModelFactory.java (66%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/adapter/NoticeListingRVViewholder.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/gateway/NoticeGateway.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/model/NoticeDTO.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/model/NoticeDetailDTO.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/presenter/NoticeGatewayInterface.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/presenter/NoticePresenterInterface.java (69%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/presenter/NoticeViewModel.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/view/NoticeActivity.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/view/NoticeDetailFragment.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/notice/view/NoticeListingFragment.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/OTPVerificationViewModelFactory.java (63%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/gateway/OTPVerificationGateway.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/model/OTPSubmitModelDTO.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/presenter/OTPVerificationGatewayInterface.java (69%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenterInterface.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/view/OTPRequestFragment.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/view/OTPVerificationActivity.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/otpverification/view/OTPVerifyFragment.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/RecipientAddViewModelFactory.java (52%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/RecipientEditViewModelFactory.java (59%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/adapter/RecipientListingRvAdapter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGateway.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGatewayInterface.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/gateway/recipientlisting/RecipientListingGateway.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/CountryServiceModel.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/ServiceTypeModel.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DropDownDTO.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DynamicValidationModel.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PaymentBankModel.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PayoutProvincesModel.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientlisting/AgentModel.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientlisting/BranchModel.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientlisting/PaymentMethodModel.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientlisting/ReceiverInfoModel.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientlisting/RecipientRelatedDataModel.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/model/recipientlisting/SendMoneyRequiredData.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/RecipientDetailValidatorFieldMapping.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddContractInterface.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBaseViewModel.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientPresenterInterface.java (69%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddViewModel.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditViewModel.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingInteractorInterface.java (65%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenter.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenterInterface.java (70%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/utils/EditTextConfigurationFactory.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/utils/InputFilterFactory.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/utils/ValidationUtils.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditTermsFragment.java (61%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientBranchListingDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListViewholder.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientModifyPromptDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGateway.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGatewayInterface.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/gateway/recipientlistingV3/RecipientListingV3Gateway.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/CountryServiceModel.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/ServiceTypeModel.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PayoutProvincesModel.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/BranchV3Model.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/RecipientDetailValidatorFieldMappingV3.java (96%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientTermsViewModel.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3ViewModel.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java (68%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java (87%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3InteractorInterface.java (78%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/utils/InputFilterFactory.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/utils/ValidationUtils.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/RecipientAddV3ViewModelFactory.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/RecipientEditV3ViewModelFactory.java (59%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/RecipientTermsViewModelFactory.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/BeneficiaryAddEditV3TermsActivity.java (73%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3TermsFragment.java (69%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientBranchListingDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListRVViewholderV3.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientModifyPromptDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/RegisterViewModelFactory.java (68%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/gateway/RegisterV2Gateway.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/model/RegisterApiResponse.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/presenter/RegisterV2InteractorInterface.java (68%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/presenter/RegisterV2Presenter.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/presenter/RegisterV2PresenterInterface.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/presenter/RegisterViewLiveData.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/register/view/RegisterV2Activity.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/ExistingCustomerRegisterViewModelFactory.java (59%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/gateway/ExistingExistingRegisterV2Gateway.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingCustomerRegistrationRequestDTO.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingRegisterApiResponse.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2InteractorInterface.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationRequestLiveData.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationSubmitLiveData.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegisterV2Activity.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationRequestFragment.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/NewRegisterViewModelFactory.java (59%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/model/NewRegisterApiResponse.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterViewLiveData.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/RenewIdViewModelFactory.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/gateway/RenewFileDownloadGateway.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/gateway/RenewIdV2Gateway.java (75%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/model/RenewIdRequestDataDTO.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/presenter/RenewIdV2InteractorInterface.java (52%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/presenter/RenewIdV2PresenterInterface.java (56%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java (83%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/view/RenewIdActivity.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/renewId/view/RenewUserIdLiveData.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/ResetPassViewModelFactory.java (64%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/gateway/ResetPassV2Gateway.java (57%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/model/Data.java (78%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/model/ResetApiResponse.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2InteractorInterface.java (50%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2PresenterInterface.java (63%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/presenter/ResetPassViewLiveData.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/resetpassword/view/ResetPassV2Activity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/RemitAuthManager.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/RemitAuthManager1.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/RemitAuthManagerGateway.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/auth/RemitUserPasswordPromptBottomSheetDialog.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/model/RemitAuthFailedResult.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/model/RemitAuthSuccessResult.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/model/RemitBiometricEncryptionDTO.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/model/RemitTxnParam.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/utils/AESEncryptionHelper.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/utils/SecurityUtils.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/security/utils/SignatureCheck.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/SendMoneyViewModelFactory.java (66%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/adapter/ExRateCurrencyListingAmountDetailRvAdapter.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBankListingRvAdapter.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBranchListingRvAdapter.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/adapter/SendMoneyPayoutModeRvAdapter.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/gateway/SendMoneyTransactionCompleteV2Gateway.java (52%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/gateway/SendMoneyV2Gateway.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/ExRateAPIRequestBody.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/SendMoneyAPIRequestBody.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/SendMoneyRequiredDataV3.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteV2ResponseBody.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionResponseBody.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/amountdetail/AmountDetailRelatedDataModel.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/amountdetail/BranchListApiResponse.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/amountdetail/RecipientCurrencyModel.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/ccdi/CCDIDataDto.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/payoutmode/AccountValidationApiResponse.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/payoutmode/BankBranchDTO.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/payoutmode/BankList.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutMode.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeApiResponse.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeModel.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/model/verification/VerificationViewModel.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2InteractorInterface.java (54%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java (62%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2InteractorInterface.java (79%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2PresenterInterface.java (60%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/SendMoneyActionListener.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java (75%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailExRateCountryListingDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/amountdetail/ExRateCountryListRvViewHolder.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/ccdi/CCIDDetailViewLiveData.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/consent/UserConsentSendMoneyFragment.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingRvViewHolder.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingRvViewHolder.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeSendMoneyFragment.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/payoutmode/SendMoneyPayoutModeRVViewHolder.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/verification/TermsAndConditionV2BrowserActivity.java (69%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/sendmoney/view/verification/VerificationSendMoneyFragment.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/FingerPrintSetupModelFactory.java (52%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/adapter/LanguageSelectionDialogRVAdapter.java (85%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java (78%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/gateway/LanguageSelectionGatewayInterface.java (72%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/model/FingerPrintSetupRequestModel.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/model/FingerPrintSetupResponse.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java (66%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/view/FingerprintEnablePromptActivity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/view/LanguageSelectionDialogItemHolder.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/view/LanguageSelectionListingDialog.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/view/SettingsView.java (76%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupPresenterInterface.java (56%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/viewModel/FingerSetupLiveData.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/settings/viewModel/FingerSetupViewModel.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/adapter/LanguageSelectionRVAdapter.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/adapter/PayoutModeSelectionRVAdapter.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/adapter/ViewPagerAVDSplashAdapter.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/gateway/SplashScreenGateway.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/model/LanguageModel.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/presenter/SplashScreenInteractorInterface.java (67%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenterInterface.java (70%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java (75%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/view/SplashScreen.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD1Fragment.java (70%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD2Fragment.java (71%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD3Fragment.java (70%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/support/gateway/SupportActivityV2Gateway.java (83%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/support/model/SupportActivityV2APIResponse.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/support/model/SupportSuccessModel.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/support/presenter/SupportActivityV2InteractorInterface.java (69%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/support/presenter/SupportActivityV2Presenter.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/support/presenter/SupportActivityV2PresenterInterface.java (73%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/support/view/SupportActivityV2.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/TermsAndConditionViewModelFactory.java (68%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/gateway/TermsAndConditionGateway.java (71%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/model/TermsDTO.java (92%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionInteractorInterface.java (67%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionPresenterInterface.java (63%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionViewModel.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionAcitivity.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionFragment.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/termsandcondition/view/WebViewPDFFragment.java (72%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/RemitTransactionViewModelFactory.java (63%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/gateway/TransactionHistoryV2Gateway.java (66%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryAPIResponse.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryItemModel.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryAPIResponse.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryItemModel.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/model/InternationalTransactionHistoryDTO.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2InteractorInterface.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2Presenter.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2PresenterInterface.java (60%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java (74%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/TransactionHistoryV2ActionListener.java (53%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/international/InternationalOutboundTransactionHistoryTypeFragmentV2.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/international/InternationalTransactionHistoryContainerFragmentV2.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java (85%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/transactionhistory/view/international/adapter/TransactionHistoryViewPagerAdapter.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/userprofile/UserProfileViewModelFactory.java (65%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/userprofile/gateway/UserProfileGateway.java (76%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/userprofile/model/UserProfile.java (97%) create mode 100644 app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterInterface.java (58%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterV2.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/userprofile/view/ProfileActivity.java (80%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/adapter/WalletStatementRVAdapter.java (90%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/gateway/WalletStatmentV2Gateway.java (81%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/model/WalletStatementV2APIResponse.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/model/WalletStatementV2ItemModel.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2InteractorInterface.java (52%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2Presenter.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2PresenterInterface.java (55%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java (87%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/walletstatement/view/WalletStatementV2Activity.java (88%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/webbrowser/model/KeyValueData.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/webbrowser/model/WebRequestModel.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/WithdrawViewModelFactory.java (65%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/gateway/WithdrawGateway.java (78%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/model/WithdrawStatusResponseDTO.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/presenter/WithdrawGatewayInterface.java (72%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenter.java (89%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenterInterface.java (63%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/view/WithdrawAmountInputFragment.java (84%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/features/withdraw/view/WithdrawTransactionReviewFragment.java (82%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/services/JMEFcmMessagingService.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/Constants.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/ImageUtils.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/RxUtils.java (98%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/Utils.java (93%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/APIRequestErrorReturn.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/API_URL.java (99%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/ApiEndpoints.java (86%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/GenericApiObserverResponse.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/GenericApiObserverResponseV2.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/GenericApiResponse.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/GenericResponseDataModel.java (96%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/GenericThrowable.java (70%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/HTTPConstants.java (95%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/HttpClientV2.java (94%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/MessageResponseDataModel.java (91%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/RestApi.java (75%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/SessionExpiredException.java (73%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/https/UserSessionObserverResponse.java (97%) rename app/src/main/java/com/{swifttech => }/remit/jmecustomer/utils/other/Utility.java (98%) delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseGatewayInterface.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java delete mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java create mode 100644 app/src/main/res/layout/dialog_generic_prompt_single_button.xml rename app/src/test/java/com/{swifttech => }/remit/jmecustomer/ExampleUnitTest.java (97%) rename app/src/test/java/com/{swifttech => }/remit/jmecustomer/HomeNotificationHandlerTest.java (92%) create mode 100644 app/src/test/java/com/remit/jmecustomer/UtilityTest.java rename app/src/test/java/com/{swifttech => }/remit/jmecustomer/ValidationRuleTest.java (97%) delete mode 100644 app/src/test/java/com/swifttech/remit/jmecustomer/UtilityTest.java diff --git a/SpinnerDatePickerLib-release/build/.transforms/10d603af2f850afbee41be58b45e1b57.bin b/SpinnerDatePickerLib-release/build/.transforms/10d603af2f850afbee41be58b45e1b57.bin new file mode 100644 index 00000000..e69de29b diff --git a/SpinnerDatePickerLib-release/build/.transforms/14ab68a60bd5d17b26576662023034a4.bin b/SpinnerDatePickerLib-release/build/.transforms/14ab68a60bd5d17b26576662023034a4.bin new file mode 100644 index 00000000..e69de29b diff --git a/SpinnerDatePickerLib-release/build/.transforms/14f1557aeeb62c1044b4f64c3f4885d8.bin b/SpinnerDatePickerLib-release/build/.transforms/14f1557aeeb62c1044b4f64c3f4885d8.bin new file mode 100644 index 00000000..c626d1be --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/14f1557aeeb62c1044b4f64c3f4885d8.bin @@ -0,0 +1 @@ +i/jars/classes.jar diff --git a/SpinnerDatePickerLib-release/build/.transforms/192e5272835f34667d8c3e0f3e04c609.bin b/SpinnerDatePickerLib-release/build/.transforms/192e5272835f34667d8c3e0f3e04c609.bin new file mode 100644 index 00000000..a895d906 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/192e5272835f34667d8c3e0f3e04c609.bin @@ -0,0 +1 @@ +o/jetified-SpinnerDatePickerLib-release-runtime diff --git a/SpinnerDatePickerLib-release/build/.transforms/192e5272835f34667d8c3e0f3e04c609/jetified-SpinnerDatePickerLib-release-runtime/classes.dex b/SpinnerDatePickerLib-release/build/.transforms/192e5272835f34667d8c3e0f3e04c609/jetified-SpinnerDatePickerLib-release-runtime/classes.dex new file mode 100644 index 0000000000000000000000000000000000000000..911a625b90cb327cb0a712a22a3dafc32b4bc81d GIT binary patch literal 35308 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 K#t$gPzyJU(Ruj+w literal 0 HcmV?d00001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/6d2e524242794464aec5dcfff8a6e26e.bin b/SpinnerDatePickerLib-release/build/.transforms/6d2e524242794464aec5dcfff8a6e26e.bin new file mode 100644 index 00000000..fcbf8d4b --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/6d2e524242794464aec5dcfff8a6e26e.bin @@ -0,0 +1 @@ +i/AndroidManifest.xml diff --git a/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420.bin b/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420.bin new file mode 100644 index 00000000..2367e569 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420.bin @@ -0,0 +1 @@ +o/com.tsongkha.spinnerdatepicker diff --git a/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker.xml.flat new file mode 100644 index 0000000000000000000000000000000000000000..6343127991e2aef04af7a91a30476e2dc671ee52 GIT binary patch literal 3204 zcmeH}?@!Y}7{>>0&>drzf+&4qpzkc%j^UOurimyJNv0CP*UPQFt_N+exn9Bf%6IBt z;amRz{|Wyo_4;F&fib!03rK9TrS~NL_IaM~=bqlq&f)P?p->qAyoy+e%MgL?Ty_sM z4~=Ndp^Z51hr~L?Oe@^GWqg~0Zz9Yh7@ZS`b8NW*_2_T}k9ceoddTPrws-^?_6g7a zQD8GlY|qpPIEaa7!#Zauh#boN2)5gnWjW1Gd!yYNG~114 zqvLG0@Mg2&IQGL<6P{pB9D?oIAB7o?;MH2{Z+*|KfEkgNjYitEQa7tW5i6et+!gCJ z^EN1pb%+=axCpG6^I%p4Mi?=%>=p{(>oVwo*}Oc>bU6>VA&e{+`zWgC@w!EQh{99R ziwNd1eOg)6D?JhjtzOz^;}wv2UaMvm^@j|d5kArvERiH;eU~!wPE>$A<3LJqJ{NQ` z8M<7roHG>mEukcIji*vlm0aqa*xc1;HrpFE35{n`8grr!@n*yc4RqxUGfphznN@8D zfK_qnMdhwqGruf?&zBqdSn5U7#MbAYtX~*?t$lbdRobKvlaB65DNVQmelcch8p!;} zJ-M$wFc-9PYEd3qRhP|ACGftaS6;^c0JCiC8*(<49csl98hBVQau#Dlt`$ocj~@ib zG`8Fq)E+B6l4?c53rKlM2gSeKWxG;|sQE7Q5gU?VFR=AuBiUzi&Mr)-^svKonSH5b z@{dJ7OXhVtLb7!JM(2nlHqK{9DxXR8OIyhV5+h?xRjweru2wH2TT_?J4<+!ucwLd* zmTE?Vtdb%tzI6YAO^zbk4FR_P8(_Dt0=uo=F+Y~Tk82BTR~p!I3T$%L`cLdlAhy%W iMr>CQJFk_-hqOJlD(3ErS~Sbr6cD%j>SA*EE&K%P+#{F( literal 0 HcmV?d00001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker_container.xml.flat new file mode 100644 index 0000000000000000000000000000000000000000..cd0080e165ec84a2b7c3e229cf4ab6f0de81e047 GIT binary patch literal 1128 zcmd6m-D=w~6oB)$EK$?Wb8lADLhFk$ToN^@jmcopb{%vOSfJZ=P$W4%t!)`eX_h|1 zZucI0nZ3}|#O=r~3cj1bLOP&N=bTSIKOcXsRw|XpZ`?2&GukE))YogYpOB@PYs`q| zlN{(RmlG;7O(5gauDq$czpMD0;!zTY24gMbhG zeiX6Oz{fXSLj;_4p9M><@N-r5zNd-z3bjpwIgvcmcCB?}+JSyG(Ga~XlDEBB>-;^& zipD%8s#nB&RHT^Xx295sirSqDaw2X;Z zNVtEnk+`2r0k;ca%wZO5r?ZeGUwJiL_o5W4Q=k^WbnG+-;R%D>{aA{zW$G|D6AdDB zT6bJ(pd|5j>?T5oW;l)3fpzL_+b6j`?MDX!S8vq?+<>Q`oM6|?!#v#-9%CS5bLKN8~f0>V$Sw6}}lj3>|*V(8jb!q;3a6u?H7b*u1urj zCj~DZBp-Wm1}Ni;H!uEeKyufMb<+C0SXusnw2jXMX!74j8H?X`rk2TvUcloHr~p@r p;-kj$dLcZ?bCa81sG|Op@DsYjCdU8( literal 0 HcmV?d00001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_picker_dialog_container.xml.flat new file mode 100644 index 0000000000000000000000000000000000000000..5916a6e3c46e5374f65bac65040dc768c07aab06 GIT binary patch literal 728 zcmb7?&q@O^5XSpQQDPPCLCWH3^;BtNb<0{$7DZGF7OLlxCbQkCyPG9Rt@Q!C`A$BE zPh;Ayf*@iC63CGJX1*`eZg=nVxm@mRy%+4k#(_<|&5}0Ae#EA7Y^Y!c`YG~9P8=1OsD$hl#YernG0q0%cdp5pbiaf*8$WXNgb}1?{Dn zSj?p@(VbW5;Gm`;0;Yiu#uy1&H;N@XkSf;H_c`Z**Yc12=D_nCUZWKpH{sZ81c5kd zdUON^0|Zg~6Rbefe~7C;$5C~U?AktO9xNKX_?BK+&y&|8X_2)|O}QExlb%tkc?dDn z^(`*FvnaPdZo27u8888GKhQ=vP6ieqbW4Z42Qm9gfnxHV@Pg0eX3xqf;>#N(R JGdu0fegg8@^KAeC literal 0 HcmV?d00001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_date_range_picker_dialog_container.xml.flat new file mode 100644 index 0000000000000000000000000000000000000000..243cb0958d31cd1d92101a17769b685f20e6f023 GIT binary patch literal 2232 zcmds&-)_?|6vn&$VZmEj7lwp_KwIt>w0iAYs!bp^HYSiNG10TeGu|vsVJVRF=u4yq6EEV+dM2=jdqJ336OyleCgW?lq92iA*cH1uJvy*owImdOq(tF-s;#4e;j1ePhC>-myQvEousjJ^kkmKZ1`)+<%qXvxX6 zluCg)rwEf3`bwrJ26CVlNLtC9lRg@%tk9;gBuN-!A|55D$uNzRK|C0Vvmu(r-$j1($=`DpH;b$!3O4b6|T1P7S0r@S^F8c^3!YlEF{M)-1&0qI`i@uJ?|ODkY1$# literal 0 HcmV?d00001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat b/SpinnerDatePickerLib-release/build/.transforms/6d76b6f8c6a59da15852d842e3158420/com.tsongkha.spinnerdatepicker/layout_number_picker_year.xml.flat new file mode 100644 index 0000000000000000000000000000000000000000..14f26deb5be3410860eb30202e1a1df9b4fafa81 GIT binary patch literal 1020 zcmbu7-%2Af6voG@tPWjp2U&D3=TfoRx>JTO2wTuaL8Vytx@3}*PIM+2k~4JseBOEG zL--(O+o@1NVK9(?2fiQQcap(ic)R9#-f}*#yNesXD?GO9^L|cexEU{B55P@Y%=Xx?DBdoa8L!!tu5CR|6$Yb`(JAR!9j*t{vyP(3<_#Hb-lxML1=mJ z!dg<-LZ=Vg*Yg%GvPLI<1AVY9G^;F4a|k!kR1lpvlJCCCFVwBBSazlPl62aL)RH_5 zejmPVP;}9V@^$e7;|$~^!>~Oyv>Y?75EMqu4DHmYf|`j`XNrd#T`tS$tdXH_E0jwR rSY!S)!UQXrn|Zi}ozHMaNX^pEppl<;?Pn@EX5nVP=Q{KMFM8e!Mw?n| literal 0 HcmV?d00001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4.bin b/SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4.bin new file mode 100644 index 00000000..83091ceb --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4.bin @@ -0,0 +1 @@ +o/com.tsongkha.spinnerdatepicker-r.txt diff --git a/SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4/com.tsongkha.spinnerdatepicker-r.txt b/SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4/com.tsongkha.spinnerdatepicker-r.txt new file mode 100644 index 00000000..48e8b003 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/7359843e088155d35627e7a9cb53fcd4/com.tsongkha.spinnerdatepicker-r.txt @@ -0,0 +1,18 @@ +com.tsongkha.spinnerdatepicker +id datePickerContainer +id dateRangePickerContainer +id day +id fromDateText +id month +id number_picker +id parent +id toDateText +id year +layout date_picker +layout date_picker_container +layout date_picker_dialog +layout date_picker_dialog_container +layout date_range_picker_dialog_container +layout number_picker_day_month +layout number_picker_year +string app_name diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354.bin b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354.bin new file mode 100644 index 00000000..72f42ec4 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354.bin @@ -0,0 +1 @@ +o/jetified-SpinnerDatePickerLib-release diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml new file mode 100644 index 00000000..91872c26 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/R.txt b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/R.txt new file mode 100644 index 00000000..a4cd40bf --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/R.txt @@ -0,0 +1,17 @@ +int id datePickerContainer 0x7f0b0001 +int id dateRangePickerContainer 0x7f0b0002 +int id day 0x7f0b0003 +int id fromDateText 0x7f0b0004 +int id month 0x7f0b0005 +int id number_picker 0x7f0b0006 +int id parent 0x7f0b0007 +int id toDateText 0x7f0b0008 +int id year 0x7f0b0009 +int layout date_picker 0x7f0e0001 +int layout date_picker_container 0x7f0e0002 +int layout date_picker_dialog 0x7f0e0003 +int layout date_picker_dialog_container 0x7f0e0004 +int layout date_range_picker_dialog_container 0x7f0e0005 +int layout number_picker_day_month 0x7f0e0006 +int layout number_picker_year 0x7f0e0007 +int string app_name 0x7f140001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/jars/classes.jar b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/jars/classes.jar new file mode 100644 index 0000000000000000000000000000000000000000..ccf6e3ecc1b1401f13c4806bf0367f2586b01a9c GIT binary patch literal 32641 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 + + + + + + + + + + + + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml new file mode 100644 index 00000000..d0adf06a --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml new file mode 100644 index 00000000..58420ea2 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml new file mode 100644 index 00000000..08cd4a09 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml @@ -0,0 +1,8 @@ + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml new file mode 100644 index 00000000..f5157e55 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml new file mode 100644 index 00000000..88fa7445 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml new file mode 100644 index 00000000..b728394a --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/values/values.xml b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/values/values.xml new file mode 100644 index 00000000..c81f7153 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/77cccf497075b471419f25e241ffd354/jetified-SpinnerDatePickerLib-release/res/values/values.xml @@ -0,0 +1,4 @@ + + + SpinnerDatePicker + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/818beb10964834f6f4eb773806274959.bin b/SpinnerDatePickerLib-release/build/.transforms/818beb10964834f6f4eb773806274959.bin new file mode 100644 index 00000000..e69de29b diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc.bin b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc.bin new file mode 100644 index 00000000..e9b05857 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc.bin @@ -0,0 +1 @@ +o/SpinnerDatePickerLib-release diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/AndroidManifest.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/AndroidManifest.xml new file mode 100644 index 00000000..91872c26 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/R.txt b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/R.txt new file mode 100644 index 00000000..a4cd40bf --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/R.txt @@ -0,0 +1,17 @@ +int id datePickerContainer 0x7f0b0001 +int id dateRangePickerContainer 0x7f0b0002 +int id day 0x7f0b0003 +int id fromDateText 0x7f0b0004 +int id month 0x7f0b0005 +int id number_picker 0x7f0b0006 +int id parent 0x7f0b0007 +int id toDateText 0x7f0b0008 +int id year 0x7f0b0009 +int layout date_picker 0x7f0e0001 +int layout date_picker_container 0x7f0e0002 +int layout date_picker_dialog 0x7f0e0003 +int layout date_picker_dialog_container 0x7f0e0004 +int layout date_range_picker_dialog_container 0x7f0e0005 +int layout number_picker_day_month 0x7f0e0006 +int layout number_picker_year 0x7f0e0007 +int string app_name 0x7f140001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/jars/classes.jar b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/jars/classes.jar new file mode 100644 index 0000000000000000000000000000000000000000..ccf6e3ecc1b1401f13c4806bf0367f2586b01a9c GIT binary patch literal 32641 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 + + + + + + + + + + + + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_container.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_container.xml new file mode 100644 index 00000000..d0adf06a --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_container.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml new file mode 100644 index 00000000..58420ea2 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml new file mode 100644 index 00000000..08cd4a09 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml @@ -0,0 +1,8 @@ + + + + diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml new file mode 100644 index 00000000..f5157e55 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml new file mode 100644 index 00000000..88fa7445 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_year.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_year.xml new file mode 100644 index 00000000..b728394a --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/layout/number_picker_year.xml @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/values/values.xml b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/values/values.xml new file mode 100644 index 00000000..c81f7153 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/9d209af627d94b7249a23241412e05dc/SpinnerDatePickerLib-release/res/values/values.xml @@ -0,0 +1,4 @@ + + + SpinnerDatePicker + \ No newline at end of file diff --git a/SpinnerDatePickerLib-release/build/.transforms/a9a8681288ebb4a462c6c6fe4e9bf6d2.bin b/SpinnerDatePickerLib-release/build/.transforms/a9a8681288ebb4a462c6c6fe4e9bf6d2.bin new file mode 100644 index 00000000..1045ed22 --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/a9a8681288ebb4a462c6c6fe4e9bf6d2.bin @@ -0,0 +1 @@ +o/jetified-SpinnerDatePickerLib-release-api.jar diff --git a/SpinnerDatePickerLib-release/build/.transforms/a9a8681288ebb4a462c6c6fe4e9bf6d2/jetified-SpinnerDatePickerLib-release-api.jar b/SpinnerDatePickerLib-release/build/.transforms/a9a8681288ebb4a462c6c6fe4e9bf6d2/jetified-SpinnerDatePickerLib-release-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..f504a0d68ab87fa3979e858f5fc48e0002f0ecaf GIT binary patch literal 67555 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

7SK*!%0k-1frmX>yREj*RD zO^F*6d$Gd#cNbTbLWizX$Y0MS{icUk$O zaOWwgcfutM7jMzR(ysE7&JZlCu~gh;Wi=aT8o$6R_*dX(A*7(isDgazTqSq2d^rR& ztSJ{wSv#eBidQ*J?T~@zslc8q%qe#n%Q&<^0@7=~^vX|i!te7+RFWY2f(mX+x#-(FadlR=t0(b*x&z=gAfLO$m{9O`vA) zUh9Pwwc-OQ@LdyF3Bet!R*6Sf5eaKGT+gjtBVMZ$-wE8hR)|a1f_Z4Iuq=^2&F>TP zUjx#8XRWwsuXRPe*n5ZdGM;;_59&9FhZ+q3q}0h-B5SH4@beD9Kls`0>s*%Q&>zVZ6W5VcgUzj0Zywvog&?htf+RM5RU@hY$Q%!T|-JhHA3U=op(VmZrD!o+{3XBo3 zqG7M`!TG{?dg!1KFPtO9d%&Udgt%rW#f(Kae9t-Zh zl3!dFU*(eFTZn1xpU_TU;~4i|E50to{;SZ39=sZlr}*(QKlWaO$4&frh#$xJ@qv_m z4%~zMc#0n{^Wy`4Tyw1;pUBw$3HjOm<-45k-kZe}LR@hjq8+;)kN5bo{{}qn<;Uav zc$pu2QJ>-temumFn{LG8L4G{NkC*xJ0Y7fK36F>P@eDuSya|KI5_`B;V>~@C%ldhN z?(=zJc;34i+?$^l`1PFYZxNQuaGs$XeLj9FLMkfh`RKr}H6|N-ThJ_zu1Dw%P!M<- z_@F^pZ#EM$TXap}a#{WTpGBDlShV<>z%?v-d;m4`!hmzi@5;U{a;A{Ab4rpi({dYA zu3hFXn=H`X%4UhOM@5;}D03QRDMr~;!$3xE=Uo4y*9!>j{s)v|3`76t9s{CS`k103gSO>a%`JDk8j2>zLU2$=AB;W+o3 z$GQ0rzjNC5hrcKO0m678PyA#a=fl_ z^>j9{8DCZ~K`#fM!4D|$_XzkmvDP3me@9^!A{9*H??0%&Q?Ps{(hI1+cmFu33GlBc z^WQ7NPn6*I9*_>cRA4~Pd2PfOIV|vg$hjQ}d?pD0JuL@#PM80#mWjCheF?5>C*;ZC OgIpfSS#R$FqW=RC)l827 literal 0 HcmV?d00001 diff --git a/SpinnerDatePickerLib-release/build/.transforms/ea6af13514f8fa117ce06c14d98625a4.bin b/SpinnerDatePickerLib-release/build/.transforms/ea6af13514f8fa117ce06c14d98625a4.bin new file mode 100644 index 00000000..2b02ce5d --- /dev/null +++ b/SpinnerDatePickerLib-release/build/.transforms/ea6af13514f8fa117ce06c14d98625a4.bin @@ -0,0 +1 @@ +o/jetified-SpinnerDatePickerLib-release-runtime.jar diff --git a/SpinnerDatePickerLib-release/build/.transforms/ea6af13514f8fa117ce06c14d98625a4/jetified-SpinnerDatePickerLib-release-runtime.jar b/SpinnerDatePickerLib-release/build/.transforms/ea6af13514f8fa117ce06c14d98625a4/jetified-SpinnerDatePickerLib-release-runtime.jar new file mode 100644 index 0000000000000000000000000000000000000000..7622f0df7d075744939668792f210b1cc3f672bc GIT binary patch literal 65034 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 + package="com.remit.jmecustomer"> @@ -16,7 +16,7 @@ @@ -82,12 +82,12 @@ @@ -95,7 +95,7 @@ @@ -103,53 +103,53 @@ - @@ -166,7 +166,7 @@ @@ -179,17 +179,17 @@ @@ -198,22 +198,22 @@ android:value="true" /> @@ -221,37 +221,37 @@ @@ -259,28 +259,28 @@ android:name="com.theartofdev.edmodo.cropper.CropImageActivity" android:theme="@style/Base.Theme.AppCompat" /> diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/RemitApplication.java b/app/src/main/java/com/remit/jmecustomer/RemitApplication.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/RemitApplication.java rename to app/src/main/java/com/remit/jmecustomer/RemitApplication.java index c0848077..0af4ebbc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/RemitApplication.java +++ b/app/src/main/java/com/remit/jmecustomer/RemitApplication.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer; +package com.remit.jmecustomer; import android.content.Context; import android.content.SharedPreferences; @@ -10,14 +10,16 @@ import androidx.annotation.StringRes; import androidx.multidex.MultiDex; import androidx.multidex.MultiDexApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; + import java.io.IOException; import java.net.SocketException; import io.reactivex.exceptions.UndeliverableException; import io.reactivex.plugins.RxJavaPlugins; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; - public class RemitApplication extends MultiDexApplication { @@ -44,7 +46,7 @@ public class RemitApplication extends MultiDexApplication { public static String getPreferredCountryCode() { if (mSharedPreferences == null) return "en"; - return mSharedPreferences.getString(USER_PREFERRED_COUNTRY_CODE, "en"); + return mSharedPreferences.getString(PrefKeys.USER_PREFERRED_COUNTRY_CODE, "en"); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseActivity.java b/app/src/main/java/com/remit/jmecustomer/base/BaseActivity.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseActivity.java rename to app/src/main/java/com/remit/jmecustomer/base/BaseActivity.java index 76b3466e..9a72f5d4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BaseActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import android.app.Activity; import android.content.Context; @@ -22,16 +22,14 @@ import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import android.widget.Toast; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomProgressDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.RemitLoaderDialog; -import com.swifttech.remit.jmecustomer.features.splashscreen.view.SplashScreen; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.CustomProgressDialog; +import com.remit.jmecustomer.common.customwidgets.RemitLoaderDialog; +import com.remit.jmecustomer.features.splashscreen.view.SplashScreen; +import com.remit.jmecustomer.RemitApplication; import java.util.Locale; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_LOCALE; - public class BaseActivity extends AppCompatActivity implements BaseContractInterface { private CustomProgressDialog dialog; @@ -86,7 +84,7 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter @Override protected void attachBaseContext(Context newBase) { - String lang_code = RemitApplication.getStorage().getString(USER_PREFERRED_LOCALE, "en"); + String lang_code = RemitApplication.getFingerPrintStorage().getString(PrefKeys.USER_PREFERRED_LOCALE, "en"); Context context = changeLang(newBase, lang_code); super.attachBaseContext(context); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseContractInterface.java b/app/src/main/java/com/remit/jmecustomer/base/BaseContractInterface.java similarity index 67% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseContractInterface.java rename to app/src/main/java/com/remit/jmecustomer/base/BaseContractInterface.java index 6eb05807..30458120 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseContractInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BaseContractInterface.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import android.content.Context; import android.view.View; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; public interface BaseContractInterface { void showProgressBar(boolean action,String message); - void showPopUpMessage(String message, CustomAlertDialog.AlertType alertType,CustomAlertDialog.CustomDialogActionListener listener); + void showPopUpMessage(String message, CustomAlertDialog.AlertType alertType, CustomAlertDialog.CustomDialogActionListener listener); void showToastMessage(String message); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseFragment.java b/app/src/main/java/com/remit/jmecustomer/base/BaseFragment.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseFragment.java rename to app/src/main/java/com/remit/jmecustomer/base/BaseFragment.java index 7caf0643..8824a44c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import android.app.Activity; import android.content.Context; @@ -8,7 +8,7 @@ import android.view.View; import androidx.fragment.app.Fragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; public class BaseFragment extends Fragment implements BaseContractInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseGateway.java b/app/src/main/java/com/remit/jmecustomer/base/BaseGateway.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseGateway.java rename to app/src/main/java/com/remit/jmecustomer/base/BaseGateway.java index 0d4e2b1d..4b08607a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BaseGateway.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import android.content.Context; diff --git a/app/src/main/java/com/remit/jmecustomer/base/BaseGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/base/BaseGatewayInterface.java new file mode 100644 index 00000000..65a4d2e5 --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/base/BaseGatewayInterface.java @@ -0,0 +1,4 @@ +package com.remit.jmecustomer.base; + +public interface BaseGatewayInterface { +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseInteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/base/BaseInteractorInterface.java similarity index 50% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseInteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/base/BaseInteractorInterface.java index 63d6d9f3..54f0e16e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseInteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BaseInteractorInterface.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; public interface BaseInteractorInterface { } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BasePresenter.java b/app/src/main/java/com/remit/jmecustomer/base/BasePresenter.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BasePresenter.java rename to app/src/main/java/com/remit/jmecustomer/base/BasePresenter.java index 54c021f3..a67dfe34 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BasePresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BasePresenter.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; -import com.swifttech.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.RemitApplication; public class BasePresenter implements BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BasePresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/base/BasePresenterInterface.java similarity index 73% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BasePresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/base/BasePresenterInterface.java index 2a02a14f..51484bae 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BasePresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BasePresenterInterface.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; public interface BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseViewModel.java b/app/src/main/java/com/remit/jmecustomer/base/BaseViewModel.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseViewModel.java rename to app/src/main/java/com/remit/jmecustomer/base/BaseViewModel.java index 624e6185..5484ce8d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/base/BaseViewModel.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import androidx.lifecycle.ViewModel; -import com.swifttech.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.RemitApplication; public abstract class BaseViewModel extends ViewModel implements BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrefKeys.java b/app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/PrefKeys.java rename to app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java index 4de3c0e8..2bc25ff8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrefKeys.java +++ b/app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; @SuppressWarnings("HardCodedStringLiteral") public class PrefKeys { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGateway.java b/app/src/main/java/com/remit/jmecustomer/base/PrivilegedGateway.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGateway.java rename to app/src/main/java/com/remit/jmecustomer/base/PrivilegedGateway.java index 9ec1abe8..9581fcdc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/base/PrivilegedGateway.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; import android.util.Log; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoModelV2; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.home.model.UserInfoModelV2; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.RemitApplication; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_LOCALE; +import static com.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_LOCALE; @SuppressWarnings("HardCodedStringLiteral") @@ -274,8 +274,8 @@ public abstract class PrivilegedGateway extends BaseGateway implements Privilege } @Override - public void setFingerPrintLoginStatus(boolean on) { - RemitApplication.getFingerPrintStorage().edit().putBoolean(PrefKeys.FINGER_PRINT_LOGIN_ENABLED, on).apply(); + public void setFingerPrintLoginStatus(boolean onOff) { + RemitApplication.getFingerPrintStorage().edit().putBoolean(PrefKeys.FINGER_PRINT_LOGIN_ENABLED, onOff).apply(); } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGatewayDataObserverManager.java b/app/src/main/java/com/remit/jmecustomer/base/PrivilegedGatewayDataObserverManager.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGatewayDataObserverManager.java rename to app/src/main/java/com/remit/jmecustomer/base/PrivilegedGatewayDataObserverManager.java index 6f3a60a3..ade9c668 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGatewayDataObserverManager.java +++ b/app/src/main/java/com/remit/jmecustomer/base/PrivilegedGatewayDataObserverManager.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/base/PrivilegedGatewayInterface.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/base/PrivilegedGatewayInterface.java index e0030a43..e1c94a31 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/PrivilegedGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/base/PrivilegedGatewayInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import android.content.Context; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoModelV2; +import com.remit.jmecustomer.features.home.model.UserInfoModelV2; public interface PrivilegedGatewayInterface extends BaseGatewayInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/UIStateHandler.java b/app/src/main/java/com/remit/jmecustomer/base/UIStateHandler.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/base/UIStateHandler.java rename to app/src/main/java/com/remit/jmecustomer/base/UIStateHandler.java index e3a48be9..1dadd345 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/UIStateHandler.java +++ b/app/src/main/java/com/remit/jmecustomer/base/UIStateHandler.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.base; +package com.remit.jmecustomer.base; import android.os.Handler; import android.os.Looper; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CircularIndexView.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CircularIndexView.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CircularIndexView.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/CircularIndexView.java index 57039d45..08df6519 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CircularIndexView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CircularIndexView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.graphics.Canvas; @@ -8,7 +8,7 @@ import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class CircularIndexView extends View { Paint arcPaint; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CurrencyFormatterTextWatcher.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CurrencyFormatterTextWatcher.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CurrencyFormatterTextWatcher.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/CurrencyFormatterTextWatcher.java index f3948d01..9e4cf4b7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CurrencyFormatterTextWatcher.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CurrencyFormatterTextWatcher.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.text.Editable; import android.text.TextWatcher; import android.widget.EditText; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class CurrencyFormatterTextWatcher implements TextWatcher { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomAlertDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomAlertDialog.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomAlertDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomAlertDialog.java index bdaa49f6..62af17bf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomAlertDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomAlertDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.app.Dialog; import android.os.Bundle; @@ -15,9 +15,9 @@ import android.widget.TextView; import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.PrefKeys; public class CustomAlertDialog extends DialogFragment { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomAppBarLayoutBehavior.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomAppBarLayoutBehavior.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomAppBarLayoutBehavior.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomAppBarLayoutBehavior.java index 52db8627..f3d0ec4d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomAppBarLayoutBehavior.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomAppBarLayoutBehavior.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import com.google.android.material.appbar.AppBarLayout; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomPaddingRv.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomPaddingRv.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomPaddingRv.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomPaddingRv.java index 1cc20ea8..d178743a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomPaddingRv.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomPaddingRv.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.graphics.Rect; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomProgressDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomProgressDialog.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomProgressDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomProgressDialog.java index 9bb19ce7..cff80564 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomProgressDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomProgressDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.app.Dialog; import android.os.Bundle; @@ -9,7 +9,7 @@ import android.widget.TextView; import androidx.fragment.app.DialogFragment; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class CustomProgressDialog extends DialogFragment { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomSwipeRefreshLayout.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomSwipeRefreshLayout.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomSwipeRefreshLayout.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomSwipeRefreshLayout.java index 83e921f1..f45cf084 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/CustomSwipeRefreshLayout.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/CustomSwipeRefreshLayout.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/DepthTransformation.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/DepthTransformation.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/DepthTransformation.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/DepthTransformation.java index 68c83e8a..cc67d12a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/DepthTransformation.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/DepthTransformation.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import androidx.viewpager.widget.ViewPager; import android.view.View; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/FontCache.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/FontCache.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java index acfaf7e2..64202174 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/FontCache.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.graphics.Typeface; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GMEFormInputField.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GMEFormInputField.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GMEFormInputField.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GMEFormInputField.java index 2b872f25..19711181 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GMEFormInputField.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GMEFormInputField.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.content.res.TypedArray; @@ -7,7 +7,7 @@ import android.text.InputFilter; import android.text.TextWatcher; import android.util.AttributeSet; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class GMEFormInputField extends GMETextInputLayout { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GMETextInputLayout.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GMETextInputLayout.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GMETextInputLayout.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GMETextInputLayout.java index 4545fbbc..0f96c32e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GMETextInputLayout.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GMETextInputLayout.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import com.google.android.material.textfield.TextInputLayout; import android.util.AttributeSet; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GenericViewPagerAdapter.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GenericViewPagerAdapter.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GenericViewPagerAdapter.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GenericViewPagerAdapter.java index 0a05ffe2..ce92dbab 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GenericViewPagerAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GenericViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeButton.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeButton.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeButton.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeButton.java index 7f4dcd48..2d0b0eaa 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeButton.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeButton.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.content.res.TypedArray; @@ -7,7 +7,7 @@ import androidx.appcompat.widget.AppCompatButton; import android.util.AttributeSet; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeEditText.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeEditText.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeEditText.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeEditText.java index 5e6819d8..1b4a71e4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeEditText.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeEditText.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.content.res.TypedArray; @@ -8,8 +8,8 @@ import android.text.InputFilter; import android.text.Spanned; import android.util.AttributeSet; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.utils.Utils; /** * diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeErrorTextView.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeErrorTextView.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeErrorTextView.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeErrorTextView.java index 84388722..5abfca44 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeErrorTextView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeErrorTextView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -10,7 +10,7 @@ import android.util.AttributeSet; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Interpolator; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class GmeErrorTextView extends AppCompatTextView { private static final Interpolator interpolator=new AccelerateDecelerateInterpolator(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeRxEditText.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeRxEditText.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeRxEditText.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeRxEditText.java index f767a0b7..1d9a7576 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeRxEditText.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeRxEditText.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeRxTextInputLayout.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeRxTextInputLayout.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeRxTextInputLayout.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeRxTextInputLayout.java index 924668bf..7681492a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/GmeRxTextInputLayout.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/GmeRxTextInputLayout.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import com.google.android.material.textfield.TextInputLayout; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/HorizontalSwipeDisabledViewPager.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/HorizontalSwipeDisabledViewPager.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/HorizontalSwipeDisabledViewPager.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/HorizontalSwipeDisabledViewPager.java index f7c23fb3..b68f8524 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/HorizontalSwipeDisabledViewPager.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/HorizontalSwipeDisabledViewPager.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/JmeTextView.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/JmeTextView.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/JmeTextView.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/JmeTextView.java index 8b951c80..491b94d3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/JmeTextView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/JmeTextView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.content.res.TypedArray; @@ -7,7 +7,7 @@ import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; /** * Created by frantic on 12/14/17. diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/LineDividerItemDecoration.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/LineDividerItemDecoration.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/LineDividerItemDecoration.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/LineDividerItemDecoration.java index 005a1088..1327f096 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/LineDividerItemDecoration.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/LineDividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/LockableScrollView.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/LockableScrollView.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/LockableScrollView.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/LockableScrollView.java index 2aa2151a..5fae8217 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/LockableScrollView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/LockableScrollView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/PaddedVerticalView.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/PaddedVerticalView.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/PaddedVerticalView.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/PaddedVerticalView.java index 7e8f102d..e7bcfdda 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/PaddedVerticalView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/PaddedVerticalView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.graphics.Canvas; @@ -8,7 +8,7 @@ import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class PaddedVerticalView extends View { Paint arcPaint; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java index b22b2ec0..7493d600 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/RemitLoaderDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.app.Dialog; import android.os.Bundle; @@ -10,7 +10,7 @@ import android.view.Window; import androidx.fragment.app.DialogFragment; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/SelectedRedBorderWithTickDecoration.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/SelectedRedBorderWithTickDecoration.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/SelectedRedBorderWithTickDecoration.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/SelectedRedBorderWithTickDecoration.java index 28c10e4c..2738f31d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/SelectedRedBorderWithTickDecoration.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/SelectedRedBorderWithTickDecoration.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import android.graphics.Canvas; @@ -8,8 +8,8 @@ import android.os.Build; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.utils.Utils; public class SelectedRedBorderWithTickDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/SwipeDisabledViewPager.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/SwipeDisabledViewPager.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/SwipeDisabledViewPager.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/SwipeDisabledViewPager.java index 675d593c..c0207386 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/SwipeDisabledViewPager.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/SwipeDisabledViewPager.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/TextWatcherAdapter.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/TextWatcherAdapter.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/TextWatcherAdapter.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/TextWatcherAdapter.java index f48a689b..8689d13b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/TextWatcherAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/TextWatcherAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.text.Editable; import android.text.TextWatcher; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/UserLockBottomSheetBehavior.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/UserLockBottomSheetBehavior.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/UserLockBottomSheetBehavior.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/UserLockBottomSheetBehavior.java index fec6d2d6..f4448859 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/UserLockBottomSheetBehavior.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/UserLockBottomSheetBehavior.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.content.Context; import com.google.android.material.bottomsheet.BottomSheetBehavior; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/WaveProgressBarView.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/WaveProgressBarView.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/WaveProgressBarView.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/WaveProgressBarView.java index 4e22e12d..3a67a065 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/WaveProgressBarView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/WaveProgressBarView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import android.animation.Animator; import android.animation.ValueAnimator; @@ -15,7 +15,7 @@ import android.view.animation.Interpolator; import androidx.core.content.ContextCompat; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class WaveProgressBarView extends View implements View.OnClickListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/ZoomOutTransformation.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/ZoomOutTransformation.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/ZoomOutTransformation.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/ZoomOutTransformation.java index d16df02d..0aa0b5b3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/ZoomOutTransformation.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/ZoomOutTransformation.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets; +package com.remit.jmecustomer.common.customwidgets; import androidx.annotation.NonNull; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/banklistingdialog/BankIconMapper.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/banklistingdialog/BankIconMapper.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/banklistingdialog/BankIconMapper.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/banklistingdialog/BankIconMapper.java index 5c857763..38b9bec1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/banklistingdialog/BankIconMapper.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/banklistingdialog/BankIconMapper.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.banklistingdialog; +package com.remit.jmecustomer.common.customwidgets.banklistingdialog; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class BankIconMapper { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java index 33260bf0..640f83ad 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/banklistingdialog/BankWithIconListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.banklistingdialog; +package com.remit.jmecustomer.common.customwidgets.banklistingdialog; import android.app.Dialog; import android.content.Context; @@ -21,8 +21,8 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java index 2d44c50d..0feb9ccb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericEditTextPromptDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.common; +package com.remit.jmecustomer.common.customwidgets.common; import android.app.Dialog; import android.os.Bundle; @@ -13,8 +13,8 @@ import android.widget.Toast; import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.view.MTextInputLayout; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.view.MTextInputLayout; public class GenericEditTextPromptDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericImageWithTextListingDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericImageWithTextListingDialog.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericImageWithTextListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericImageWithTextListingDialog.java index ce3429e1..c5e8a7b4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericImageWithTextListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericImageWithTextListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.common; +package com.remit.jmecustomer.common.customwidgets.common; import android.app.Dialog; import android.content.Context; @@ -21,7 +21,7 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericPromptDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericPromptDialog.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericPromptDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericPromptDialog.java index 1e4427b9..c4776f49 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericPromptDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericPromptDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.common; +package com.remit.jmecustomer.common.customwidgets.common; import android.app.Dialog; import android.os.Bundle; @@ -12,7 +12,7 @@ import android.widget.Toast; import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class GenericPromptDialog extends DialogFragment implements View.OnClickListener { @@ -44,8 +44,13 @@ public class GenericPromptDialog extends DialogFragment implements View.OnClickL btnRenew.setText(positiveBtnString); if(negativeBtnString!=null) btnLater.setText(negativeBtnString); - if(titleString!=null) + if(titleString!=null){ + txt_dialog_title.setVisibility(View.VISIBLE); txt_dialog_title.setText(titleString); + }else{ + txt_dialog_title.setVisibility(View.GONE); + } + messageBodyTxtView.setText(bodyString); if(iconsRes!=-1) { @@ -109,6 +114,14 @@ public class GenericPromptDialog extends DialogFragment implements View.OnClickL this.negativeBtnString=string; } + + public void showHideNegativeicon(boolean status){ + if(status==false){ + btnLater.setVisibility(View.GONE); + }else { + btnLater.setVisibility(View.VISIBLE); + } + } public void setIconsRes(int iconsRes) { this.iconsRes = iconsRes; } diff --git a/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericPromptDialogSingleButton.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericPromptDialogSingleButton.java new file mode 100644 index 00000000..d4f07962 --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericPromptDialogSingleButton.java @@ -0,0 +1,165 @@ +package com.remit.jmecustomer.common.customwidgets.common; + +import android.app.Dialog; +import android.os.Bundle; +import android.view.Gravity; +import android.view.View; +import android.view.Window; +import android.widget.ImageView; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.fragment.app.DialogFragment; + +import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.remit.jmecustomer.R; + +public class GenericPromptDialogSingleButton extends DialogFragment implements View.OnClickListener { + + ImageView iconView; + TextView btnRenew; + TextView messageBodyTxtView; + TextView txt_dialog_title; + private Window window; + private String titleString=null; + private String bodyString; + private String positiveBtnString=null; + private String negativeBtnString=null; + private int iconsRes=-1; + private GenericDialogPromptSingleButtonListener listener; + private boolean shouldBeCancellable=true; + + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); + View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_generic_prompt_single_button, null); + iconView = view.findViewById(R.id.iconView); + messageBodyTxtView = view.findViewById(R.id.messageBodyTxtView); + txt_dialog_title = view.findViewById(R.id.txt_dialog_title); + btnRenew = view.findViewById(R.id.btnRenew); + if(positiveBtnString!=null) + btnRenew.setText(positiveBtnString); + + if(titleString!=null){ + txt_dialog_title.setVisibility(View.VISIBLE); + txt_dialog_title.setText(titleString); + }else{ + txt_dialog_title.setVisibility(View.GONE); + } + + messageBodyTxtView.setText(bodyString); + if(iconsRes!=-1) + { + try { + iconView.setImageResource(iconsRes); + } + catch (Exception e) + { + iconView.setVisibility(View.GONE); + } + } + else + { + iconView.setVisibility(View.GONE); + + } + setCancelable(shouldBeCancellable); + builder.setView(view); + initialize(); + Dialog dialog = builder.create(); + try { + this.window = dialog.getWindow(); + window.setBackgroundDrawableResource(R.drawable.ic_rounded_white); + + } catch (NullPointerException e) { + + } + return dialog; + + } + + private void initialize() { + + + } + + public void setCancellable(boolean action) + { + shouldBeCancellable=action; + } + + + public void setListener(GenericDialogPromptSingleButtonListener listener) { + this.listener = listener; + } + + public void setTitleMessage(String title) { + this.titleString=title; + } + public void setBodyMessage(String body) { + this.bodyString=body; + } + + public void setPositiveBtnString(String string) + { + this.positiveBtnString=string; + } + + public void setNegativeBtnString(String string) + { + this.negativeBtnString=string; + } + + public void setIconsRes(int iconsRes) { + this.iconsRes = iconsRes; + } + + @Override + public void onStart() { + super.onStart(); + btnRenew.setOnClickListener(this); + } + + @Override + public void onStop() { + super.onStop(); + btnRenew.setOnClickListener(null); + } + + @Override + public void onResume() { + super.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + + } + + + private void showToastMessage(String message) { + Toast toast = Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT); + TextView v = (TextView) toast.getView().findViewById(android.R.id.message); + if (v != null) v.setGravity(Gravity.CENTER); + toast.show(); + } + + @Override + public void onClick(View v) { + switch(v.getId()) + { + case R.id.btnRenew: + dismiss(); + if(listener!=null) + listener.onPositiveBtnPressed(); + break; + } + } + public interface GenericDialogPromptSingleButtonListener + { + void onPositiveBtnPressed(); + } + +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericTextListingDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericTextListingDialog.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericTextListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericTextListingDialog.java index bd15cb9d..2e6511e8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/common/GenericTextListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/common/GenericTextListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.common; +package com.remit.jmecustomer.common.customwidgets.common; import android.app.Dialog; import android.content.Context; @@ -20,7 +20,7 @@ import android.widget.EditText; import android.widget.TextView; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java index 90323b65..9307ac3f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; +package com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.R; import java.util.List; @@ -234,7 +234,7 @@ public class CountryFlagMapper { } } - public static String getLanguageFromCountryCode(List languagemodels,String LanguageCode){ + public static String getLanguageFromCountryCode(List languagemodels, String LanguageCode){ for (LanguageModel languageModel : languagemodels){ if(languageModel.getCountryCode().equalsIgnoreCase(LanguageCode)){ return languageModel.getCountryName(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java index efaa9cc6..be0770c8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; +package com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java index 7b4afd7c..93ca0afa 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; +package com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; @@ -6,8 +6,8 @@ import android.view.View; import android.view.ViewGroup; import com.bumptech.glide.Glide; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountrySelectionListener.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountrySelectionListener.java similarity index 61% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountrySelectionListener.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountrySelectionListener.java index 5dd0afad..f54f2a2e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountrySelectionListener.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/CountrySelectionListener.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; +package com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; public interface CountrySelectionListener { void onCountrySelected(CountryPaymentService countryPaymentService); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java index ef84560c..8e07dac5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; +package com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog; import android.app.Dialog; import android.content.Context; @@ -18,9 +18,9 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/maskedittext/GmeMaskedEditText.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/maskedittext/GmeMaskedEditText.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/maskedittext/GmeMaskedEditText.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/maskedittext/GmeMaskedEditText.java index 0c6c541d..6b6c4136 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/maskedittext/GmeMaskedEditText.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/maskedittext/GmeMaskedEditText.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.maskedittext; +package com.remit.jmecustomer.common.customwidgets.maskedittext; import android.content.Context; import android.content.res.TypedArray; @@ -7,8 +7,8 @@ import android.text.InputType; import android.util.AttributeSet; import android.util.TypedValue; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; public class GmeMaskedEditText extends GmeEditText { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/maskedittext/MaskedTextWatcher.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/maskedittext/MaskedTextWatcher.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/maskedittext/MaskedTextWatcher.java rename to app/src/main/java/com/remit/jmecustomer/common/customwidgets/maskedittext/MaskedTextWatcher.java index 1948c203..061558db 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/customwidgets/maskedittext/MaskedTextWatcher.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/maskedittext/MaskedTextWatcher.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.customwidgets.maskedittext; +package com.remit.jmecustomer.common.customwidgets.maskedittext; import android.text.Editable; import android.text.TextWatcher; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/model/FormInputStateDTO.java b/app/src/main/java/com/remit/jmecustomer/common/model/FormInputStateDTO.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/model/FormInputStateDTO.java rename to app/src/main/java/com/remit/jmecustomer/common/model/FormInputStateDTO.java index dcc43452..c2ab2812 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/model/FormInputStateDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/common/model/FormInputStateDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.model; +package com.remit.jmecustomer.common.model; public class FormInputStateDTO { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/AnswerInputDialog.java b/app/src/main/java/com/remit/jmecustomer/common/view/AnswerInputDialog.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/AnswerInputDialog.java rename to app/src/main/java/com/remit/jmecustomer/common/view/AnswerInputDialog.java index 3aee964f..6c8e940d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/AnswerInputDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/AnswerInputDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.app.Dialog; import android.os.Bundle; @@ -15,7 +15,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class AnswerInputDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MAutoCompleteTextView.java b/app/src/main/java/com/remit/jmecustomer/common/view/MAutoCompleteTextView.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MAutoCompleteTextView.java rename to app/src/main/java/com/remit/jmecustomer/common/view/MAutoCompleteTextView.java index 30cabcab..edceb6c5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MAutoCompleteTextView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/MAutoCompleteTextView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.content.Context; import android.content.res.TypedArray; @@ -8,8 +8,8 @@ import android.view.View; import androidx.appcompat.widget.AppCompatAutoCompleteTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.R; public class MAutoCompleteTextView extends AppCompatAutoCompleteTextView implements View.OnTouchListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputEditText.java b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputEditText.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputEditText.java rename to app/src/main/java/com/remit/jmecustomer/common/view/MTextInputEditText.java index 61292000..659353d7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputEditText.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputEditText.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.content.Context; import android.content.ContextWrapper; @@ -13,8 +13,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.google.android.material.textfield.TextInputEditText; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.R; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputEditTextSpaceMasked.java b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputEditTextSpaceMasked.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputEditTextSpaceMasked.java rename to app/src/main/java/com/remit/jmecustomer/common/view/MTextInputEditTextSpaceMasked.java index 7116d939..17f8a05c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputEditTextSpaceMasked.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputEditTextSpaceMasked.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.content.Context; import android.content.ContextWrapper; @@ -14,9 +14,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.google.android.material.textfield.TextInputEditText; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.FontCache; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.R; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputLayout.java b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputLayout.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputLayout.java rename to app/src/main/java/com/remit/jmecustomer/common/view/MTextInputLayout.java index bcc860b9..74fecadd 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputLayout.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputLayout.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputMaskedEditText.java b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputMaskedEditText.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputMaskedEditText.java rename to app/src/main/java/com/remit/jmecustomer/common/view/MTextInputMaskedEditText.java index 7697bc08..08193f2a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextInputMaskedEditText.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/MTextInputMaskedEditText.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.content.Context; import android.content.res.TypedArray; @@ -7,10 +7,10 @@ import android.text.InputType; import android.util.AttributeSet; import android.util.TypedValue; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.FontCache; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; -import com.swifttech.remit.jmecustomer.common.customwidgets.maskedittext.GmeMaskedEditText; +import com.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.common.customwidgets.maskedittext.GmeMaskedEditText; +import com.remit.jmecustomer.R; public class MTextInputMaskedEditText extends MTextInputEditText { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextView.java b/app/src/main/java/com/remit/jmecustomer/common/view/MTextView.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextView.java rename to app/src/main/java/com/remit/jmecustomer/common/view/MTextView.java index 8a2a323c..67fec773 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MTextView.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/MTextView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.content.Context; import android.content.res.TypedArray; @@ -6,8 +6,8 @@ import android.util.AttributeSet; import androidx.appcompat.widget.AppCompatTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.common.customwidgets.FontCache; +import com.remit.jmecustomer.R; public class MTextView extends AppCompatTextView { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MaskedTextWatcher.java b/app/src/main/java/com/remit/jmecustomer/common/view/MaskedTextWatcher.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MaskedTextWatcher.java rename to app/src/main/java/com/remit/jmecustomer/common/view/MaskedTextWatcher.java index 5aef9cfd..2d79806f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/MaskedTextWatcher.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/MaskedTextWatcher.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; import android.text.Editable; import android.text.TextWatcher; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/OnFragmentSelectedListener.java b/app/src/main/java/com/remit/jmecustomer/common/view/OnFragmentSelectedListener.java similarity index 60% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/OnFragmentSelectedListener.java rename to app/src/main/java/com/remit/jmecustomer/common/view/OnFragmentSelectedListener.java index 2b8593d8..4ddf56db 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/OnFragmentSelectedListener.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/OnFragmentSelectedListener.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; public interface OnFragmentSelectedListener { void onFragmentedSelected(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/ValueListener.java b/app/src/main/java/com/remit/jmecustomer/common/view/ValueListener.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/ValueListener.java rename to app/src/main/java/com/remit/jmecustomer/common/view/ValueListener.java index 785b4750..1bbfe4d3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/ValueListener.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/ValueListener.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view; +package com.remit.jmecustomer.common.view; public interface ValueListener { void onValueChanged(String value); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeGraphic.java b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeGraphic.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeGraphic.java rename to app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeGraphic.java index f5b03904..6aabf129 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeGraphic.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeGraphic.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.swifttech.remit.jmecustomer.common.view.qrscanner; +package com.remit.jmecustomer.common.view.qrscanner; import android.graphics.Canvas; import android.graphics.Color; @@ -21,7 +21,7 @@ import android.graphics.Paint; import android.graphics.RectF; import com.google.android.gms.vision.barcode.Barcode; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; +import com.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; /** * Graphic instance for rendering barcode position, size, and ID within an associated graphic diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeGraphicTracker.java b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeGraphicTracker.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeGraphicTracker.java rename to app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeGraphicTracker.java index 9d935a57..b403cc0c 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeGraphicTracker.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeGraphicTracker.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.swifttech.remit.jmecustomer.common.view.qrscanner; +package com.remit.jmecustomer.common.view.qrscanner; import androidx.annotation.UiThread; import com.google.android.gms.vision.Detector; import com.google.android.gms.vision.Tracker; import com.google.android.gms.vision.barcode.Barcode; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; +import com.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; /** * Generic tracker which is used for tracking or reading a barcode (and can really be used for diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeTrackerFactory.java b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeTrackerFactory.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeTrackerFactory.java rename to app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeTrackerFactory.java index 50ecbb59..737e147e 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/BarcodeTrackerFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/BarcodeTrackerFactory.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.swifttech.remit.jmecustomer.common.view.qrscanner; +package com.remit.jmecustomer.common.view.qrscanner; import com.google.android.gms.vision.MultiProcessor; import com.google.android.gms.vision.Tracker; import com.google.android.gms.vision.barcode.Barcode; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; +import com.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; /** * Factory for creating a tracker and associated graphic to be associated with a new barcode. The diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/QRScannerFragment.java b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/QRScannerFragment.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/QRScannerFragment.java rename to app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/QRScannerFragment.java index 57fa525f..cd43bddf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/QRScannerFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/QRScannerFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.common.view.qrscanner; +package com.remit.jmecustomer.common.view.qrscanner; import android.Manifest; import android.annotation.SuppressLint; @@ -28,11 +28,11 @@ import com.google.android.gms.vision.barcode.Barcode; import com.google.android.gms.vision.barcode.BarcodeDetector; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.camera.MCameraSource; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.camera.MCameraSourcePreview; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; +import com.remit.jmecustomer.common.view.qrscanner.camera.MCameraSource; +import com.remit.jmecustomer.common.view.qrscanner.camera.MCameraSourcePreview; +import com.remit.jmecustomer.common.view.qrscanner.camera.MGraphicOverlay; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import java.io.IOException; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MCameraSource.java b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MCameraSource.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MCameraSource.java rename to app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MCameraSource.java index 3c2159d0..8f3892ef 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MCameraSource.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MCameraSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.swifttech.remit.jmecustomer.common.view.qrscanner.camera; +package com.remit.jmecustomer.common.view.qrscanner.camera; import android.Manifest; import android.annotation.SuppressLint; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MCameraSourcePreview.java b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MCameraSourcePreview.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MCameraSourcePreview.java rename to app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MCameraSourcePreview.java index 97c0c68f..25f7ed5c 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MCameraSourcePreview.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MCameraSourcePreview.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.swifttech.remit.jmecustomer.common.view.qrscanner.camera; +package com.remit.jmecustomer.common.view.qrscanner.camera; import android.Manifest; import android.content.Context; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MGraphicOverlay.java b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MGraphicOverlay.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MGraphicOverlay.java rename to app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MGraphicOverlay.java index c693adab..760f9ac3 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/common/view/qrscanner/camera/MGraphicOverlay.java +++ b/app/src/main/java/com/remit/jmecustomer/common/view/qrscanner/camera/MGraphicOverlay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.swifttech.remit.jmecustomer.common.view.qrscanner.camera; +package com.remit.jmecustomer.common.view.qrscanner.camera; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java rename to app/src/main/java/com/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java index 40601be3..9a3a69cf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java +++ b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.aboutscreen.view; +package com.remit.jmecustomer.features.aboutscreen.view; import android.content.Intent; import android.net.Uri; @@ -10,20 +10,20 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsPresenterInterface; -import com.swifttech.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsViewModel; -import com.swifttech.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsViewModelFactory; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsPresenterInterface; +import com.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsViewModel; +import com.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsViewModelFactory; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import static com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY; +import static com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY; /** * Created by FMI-LT-17 on 2/8/2018. @@ -71,7 +71,7 @@ public class AboutJMERemit extends BaseActivity implements AboutUsPresenterInter } - @OnClick({R.id.iv_back, R.id.btn_check_update, R.id.iv_fb, R.id.iv_linkedin,R.id.txvTermsAndCondition,R.id.txvPrivacyPolicy}) + @OnClick({R.id.iv_back, R.id.btn_check_update, R.id.iv_fb, R.id.iv_linkedin,R.id.txvTermsAndCondition,R.id.txvPrivacyPolicy,R.id.txvFraudGuaranteePolicy}) public void onClick(View view) { viewModel= new ViewModelProvider(this, aboutUsViewModelFactory).get(AboutUsViewModel.class); switch (view.getId()) { @@ -90,23 +90,20 @@ public class AboutJMERemit extends BaseActivity implements AboutUsPresenterInter viewModel.getWebRequestDataForFaceBook(); break; + case R.id.txvFraudGuaranteePolicy: + viewModel.getFraudGuaranteePolicy(); + break; + + + } } @Override public void navigateToTermsAndCondition(WebRequestModel webRequestModel) { -/* Intent intent= new Intent(this, TermsAndConditionV2BrowserActivity.class); intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,webRequestModel); startActivity(intent); -*/ - - try { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/jmeremit")); - startActivity(intent); - } catch(Exception e) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/jmeremit/"))); - } } @Override @@ -116,8 +113,20 @@ public class AboutJMERemit extends BaseActivity implements AboutUsPresenterInter startActivity(intent); } + + @Override public void navigateToFaceBookPage(WebRequestModel webRequestModel) { + try { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/jmeremit")); + startActivity(intent); + } catch(Exception e) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/jmeremit/"))); + } + } + + @Override + public void navigateToFraudGuaranteePolicy(WebRequestModel webRequestModel) { Intent intent= new Intent(this, TermsAndConditionV2BrowserActivity.class); intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,webRequestModel); startActivity(intent); diff --git a/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java new file mode 100644 index 00000000..886d1f1d --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java @@ -0,0 +1,4 @@ +package com.remit.jmecustomer.features.aboutscreen.viewModel; + +public interface AboutUsInteractorInterface { +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsPresenterInterface.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsPresenterInterface.java index 7dfd0eb1..a7539974 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsPresenterInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.aboutscreen.viewModel; +package com.remit.jmecustomer.features.aboutscreen.viewModel; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; public interface AboutUsPresenterInterface extends BasePresenterInterface { void getWebRequestDataForTermsAndCondition(); @@ -12,6 +12,8 @@ public interface AboutUsPresenterInterface extends BasePresenterInterface { void getWebRequestDataForFaceBook(); + void getFraudGuaranteePolicy(); + interface AboutUsContractInterface extends BaseContractInterface { @@ -21,6 +23,8 @@ public interface AboutUsPresenterInterface extends BasePresenterInterface { void navigateToFaceBookPage(WebRequestModel webRequestModel); + void navigateToFraudGuaranteePolicy(WebRequestModel webRequestModel); + } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModel.java similarity index 66% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModel.java index 40e7e016..1ea9d564 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModel.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.aboutscreen.viewModel; +package com.remit.jmecustomer.features.aboutscreen.viewModel; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; public class AboutUsViewModel extends BaseViewModel implements AboutUsPresenterInterface{ private final AboutUsContractInterface view; @@ -13,7 +13,7 @@ public class AboutUsViewModel extends BaseViewModel implements AboutUsPresenterI @Override public void getWebRequestDataForTermsAndCondition() { - WebRequestModel webRequestModel= new WebRequestModel(view.getContext().getResources().getString(R.string.terms_and_condition_title_text), "https://www.japanremit.com/Website/TermsAndConditions", null); + WebRequestModel webRequestModel= new WebRequestModel(view.getContext().getResources().getString(R.string.terms_and_condition_title_text), "https://japanremit.com/Website/TermsAndConditions", null); view.navigateToTermsAndCondition(webRequestModel); } @@ -26,6 +26,12 @@ public class AboutUsViewModel extends BaseViewModel implements AboutUsPresenterI @Override public void getWebRequestDataForFaceBook() { WebRequestModel webRequestModel= new WebRequestModel(view.getContext().getResources().getString(R.string.app_name), "https://www.facebook.com/jmeremit/", null); + view.navigateToFaceBookPage(webRequestModel); + } + + @Override + public void getFraudGuaranteePolicy() { + WebRequestModel webRequestModel= new WebRequestModel(view.getContext().getResources().getString(R.string.fraud_guarantee_policy1_text), "https://japanremit.com/Website/FraudGuaranteePolicy", null); view.navigateToTermsAndCondition(webRequestModel); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModelFactory.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModelFactory.java index 5542722a..912101a3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsViewModelFactory.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.aboutscreen.viewModel; +package com.remit.jmecustomer.features.aboutscreen.viewModel; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/adapter/AgentListV2RvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/adapter/AgentListV2RvAdapter.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/adapter/AgentListV2RvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/adapter/AgentListV2RvAdapter.java index 7a4ded0a..bf799210 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/adapter/AgentListV2RvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/adapter/AgentListV2RvAdapter.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.adapter; +package com.remit.jmecustomer.features.agentslisting.adapter; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; -import com.swifttech.remit.jmecustomer.features.agentslisting.view.AgentListV2ItemViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; +import com.remit.jmecustomer.features.agentslisting.view.AgentListV2ItemViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java similarity index 53% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java index fe6c1dcf..a3053075 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/gateway/AgentListV2Gateway.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.gateway; +package com.remit.jmecustomer.features.agentslisting.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.agentslisting.presenter.AgentListV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.agentslisting.presenter.AgentListV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/AgentInfoModel.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/AgentInfoModel.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/AgentInfoModel.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/AgentInfoModel.java index b2b4a93f..47f2979d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/AgentInfoModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/AgentInfoModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.model; +package com.remit.jmecustomer.features.agentslisting.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/AgentsListApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/AgentsListApiResponse.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/AgentsListApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/AgentsListApiResponse.java index e3e8dcca..2f06ccb5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/AgentsListApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/AgentsListApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.model; +package com.remit.jmecustomer.features.agentslisting.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/BranchInfoModel.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/BranchInfoModel.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/BranchInfoModel.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/BranchInfoModel.java index a40dd33b..3b134726 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/model/BranchInfoModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/model/BranchInfoModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.model; +package com.remit.jmecustomer.features.agentslisting.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2InteractorInterface.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2InteractorInterface.java index 2c4d0c8a..06c813ad 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2InteractorInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.presenter; +package com.remit.jmecustomer.features.agentslisting.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2Presenter.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2Presenter.java index 69d3312d..dc58bc51 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2Presenter.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.presenter; +package com.remit.jmecustomer.features.agentslisting.presenter; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; -import com.swifttech.remit.jmecustomer.features.agentslisting.model.AgentsListApiResponse; -import com.swifttech.remit.jmecustomer.features.agentslisting.model.BranchInfoModel; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; +import com.remit.jmecustomer.features.agentslisting.model.AgentsListApiResponse; +import com.remit.jmecustomer.features.agentslisting.model.BranchInfoModel; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2PresenterInterface.java similarity index 53% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2PresenterInterface.java index ba767891..da32e9f4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/presenter/AgentListV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/presenter/AgentListV2PresenterInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.presenter; +package com.remit.jmecustomer.features.agentslisting.presenter; -import com.swifttech.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java index f31dbf09..5761892d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/view/AgentListV2Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.view; +package com.remit.jmecustomer.features.agentslisting.view; import android.content.Intent; import android.net.Uri; @@ -7,15 +7,15 @@ import android.view.View; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.agentslisting.adapter.AgentListV2RvAdapter; -import com.swifttech.remit.jmecustomer.features.agentslisting.gateway.AgentListV2Gateway; -import com.swifttech.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; -import com.swifttech.remit.jmecustomer.features.agentslisting.presenter.AgentListV2Presenter; -import com.swifttech.remit.jmecustomer.features.agentslisting.presenter.AgentListV2PresenterInterface; +import com.remit.jmecustomer.features.agentslisting.adapter.AgentListV2RvAdapter; +import com.remit.jmecustomer.features.agentslisting.gateway.AgentListV2Gateway; +import com.remit.jmecustomer.features.agentslisting.model.AgentInfoModel; +import com.remit.jmecustomer.features.agentslisting.presenter.AgentListV2Presenter; +import com.remit.jmecustomer.features.agentslisting.presenter.AgentListV2PresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/view/AgentListV2ItemViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/view/AgentListV2ItemViewHolder.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/view/AgentListV2ItemViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/agentslisting/view/AgentListV2ItemViewHolder.java index bfa55b63..8a0c92f5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/agentslisting/view/AgentListV2ItemViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/agentslisting/view/AgentListV2ItemViewHolder.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.agentslisting.view; +package com.remit.jmecustomer.features.agentslisting.view; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/appupdate/AppUpdateActivity.java b/app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/appupdate/AppUpdateActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java index 229bf2dd..c0097210 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/appupdate/AppUpdateActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.appupdate; +package com.remit.jmecustomer.features.appupdate; import android.app.Activity; import android.content.ComponentName; @@ -8,18 +8,20 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; -public class AppUpdateActivity extends AppCompatActivity implements View.OnClickListener { +public class AppUpdateActivity extends AppCompatActivity { @BindView(R.id.not_now_view) View notNowView; @@ -43,13 +45,10 @@ public class AppUpdateActivity extends AppCompatActivity implements View.OnClick super.onCreate(savedInstanceState); setContentView(R.layout.activity_app_update); ButterKnife.bind(this); - initialize(); performDefaultAction(savedInstanceState); } - private void initialize() { - } private void performDefaultAction(Bundle savedInstanceState) { if (savedInstanceState == null) { @@ -71,34 +70,27 @@ public class AppUpdateActivity extends AppCompatActivity implements View.OnClick @Override public void onBackPressed() { - if (!isForcedUpdate) - super.onBackPressed(); - else { - moveTaskToBack(true); - android.os.Process.killProcess(android.os.Process.myPid()); - System.exit(1); - } + super.onBackPressed(); } @Override protected void onStart() { super.onStart(); - btnUpdate.setOnClickListener(this); - notNowView.setOnClickListener(this); + } @Override protected void onStop() { super.onStop(); - btnUpdate.setOnClickListener(null); - notNowView.setOnClickListener(null); + } - @Override - public void onClick(View v) { - switch (v.getId()) { + @OnClick({R.id.btn_update, R.id.not_now_view}) + public void viewsClicked(View view) { + switch (view.getId()) { case R.id.btn_update: + Log.d("===>", "onClick: "); gotoPlayStore(); break; @@ -127,7 +119,7 @@ public class AppUpdateActivity extends AppCompatActivity implements View.OnClick for (ResolveInfo otherApp : otherApps) { // look for Google Play application if (otherApp.activityInfo.applicationInfo.packageName - .equals("com.jmecustomer.vending")) { + .contains("com.remit.jmecustomer")) { ActivityInfo otherAppActivity = otherApp.activityInfo; ComponentName componentName = new ComponentName( @@ -144,8 +136,8 @@ public class AppUpdateActivity extends AppCompatActivity implements View.OnClick // this make sure only the Google Play app is allowed to // intercept the intent rateIntent.setComponent(componentName); - this.startActivity(rateIntent); marketFound = true; + this.startActivity(rateIntent); break; } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/BalanceRequestViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/BalanceRequestViewModelFactory.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/BalanceRequestViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/BalanceRequestViewModelFactory.java index 996746ae..6b2b468c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/BalanceRequestViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/BalanceRequestViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest; +package com.remit.jmecustomer.features.balancerequest; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.balancerequest.gateway.BalanceRequestGateway; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; +import com.remit.jmecustomer.features.balancerequest.gateway.BalanceRequestGateway; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; public class BalanceRequestViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/gateway/BalanceRequestGateway.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/gateway/BalanceRequestGateway.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/gateway/BalanceRequestGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/gateway/BalanceRequestGateway.java index c50aecc7..0887582e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/gateway/BalanceRequestGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/gateway/BalanceRequestGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.gateway; +package com.remit.jmecustomer.features.balancerequest.gateway; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestGatewayInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/model/BalanceRequestDTO.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/model/BalanceRequestDTO.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/model/BalanceRequestDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/model/BalanceRequestDTO.java index fea25cb6..1ff0790e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/model/BalanceRequestDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/model/BalanceRequestDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.model; +package com.remit.jmecustomer.features.balancerequest.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestGatewayInterface.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestGatewayInterface.java index b5457e28..62c2e5f2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.presenter; +package com.remit.jmecustomer.features.balancerequest.presenter; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenter.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenter.java index 9e65ff91..1d4b5369 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.presenter; +package com.remit.jmecustomer.features.balancerequest.presenter; import android.graphics.Bitmap; @@ -7,14 +7,14 @@ import androidx.lifecycle.MutableLiveData; import com.google.gson.reflect.TypeToken; import com.google.zxing.WriterException; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.balancerequest.model.BalanceRequestDTO; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.balancerequest.model.BalanceRequestDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenterInterface.java similarity index 70% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenterInterface.java index 5943dfce..109d7517 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/presenter/BalanceRequestPresenterInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.presenter; +package com.remit.jmecustomer.features.balancerequest.presenter; import android.graphics.Bitmap; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java similarity index 78% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java index 6a082c92..002434cd 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.view; +package com.remit.jmecustomer.features.balancerequest.view; import android.os.Bundle; @@ -6,12 +6,12 @@ import android.os.Bundle; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.balancerequest.BalanceRequestViewModelFactory; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.balancerequest.BalanceRequestViewModelFactory; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestAmountPromptFragment.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestAmountPromptFragment.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestAmountPromptFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestAmountPromptFragment.java index 3b6478d0..b73b7f4d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestAmountPromptFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestAmountPromptFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.view; +package com.remit.jmecustomer.features.balancerequest.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,10 +12,10 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestQRViewFragment.java b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestQRViewFragment.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestQRViewFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestQRViewFragment.java index d62ce42a..06291fd1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancerequest/view/BalanceRequestQRViewFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancerequest/view/BalanceRequestQRViewFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancerequest.view; +package com.remit.jmecustomer.features.balancerequest.view; import android.graphics.Bitmap; import android.os.Bundle; @@ -11,10 +11,10 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; -import com.swifttech.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenter; +import com.remit.jmecustomer.features.balancerequest.presenter.BalanceRequestPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/BalanceSendViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/BalanceSendViewModelFactory.java similarity index 65% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/BalanceSendViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/BalanceSendViewModelFactory.java index 0afd1fc3..35082c7a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/BalanceSendViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/BalanceSendViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.balancesend; +package com.remit.jmecustomer.features.balancesend; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.balancesend.gateway.BalanceSendGateway; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenterInterface; +import com.remit.jmecustomer.features.balancesend.gateway.BalanceSendGateway; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenterInterface; public class BalanceSendViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/gateway/BalanceSendGateway.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/gateway/BalanceSendGateway.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/gateway/BalanceSendGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/gateway/BalanceSendGateway.java index 89f09a75..3517644c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/gateway/BalanceSendGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/gateway/BalanceSendGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.gateway; +package com.remit.jmecustomer.features.balancesend.gateway; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendGatewayInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/model/BalanceSendConfirmDTO.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/model/BalanceSendConfirmDTO.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/model/BalanceSendConfirmDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/model/BalanceSendConfirmDTO.java index d4767cb4..0cd437e5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/model/BalanceSendConfirmDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/model/BalanceSendConfirmDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.model; +package com.remit.jmecustomer.features.balancesend.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendGatewayInterface.java similarity index 73% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendGatewayInterface.java index 2ec6b6b4..6e33bff5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.presenter; +package com.remit.jmecustomer.features.balancesend.presenter; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java index 52e618a7..8026a0e1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.presenter; +package com.remit.jmecustomer.features.balancesend.presenter; import com.google.android.gms.vision.barcode.Barcode; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.balancesend.model.BalanceSendConfirmDTO; -import com.swifttech.remit.jmecustomer.features.balancesend.view.BalanceSendVerificationLiveData; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.balancesend.model.BalanceSendConfirmDTO; +import com.remit.jmecustomer.features.balancesend.view.BalanceSendVerificationLiveData; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenterInterface.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenterInterface.java index 74fc356e..ad9d3883 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenterInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.presenter; +package com.remit.jmecustomer.features.balancesend.presenter; import com.google.android.gms.vision.barcode.Barcode; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.balancesend.view.BalanceSendVerificationLiveData; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.balancesend.view.BalanceSendVerificationLiveData; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java index 1279bf13..5d9430e4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.view; +package com.remit.jmecustomer.features.balancesend.view; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -6,12 +6,12 @@ import androidx.lifecycle.ViewModelProvider; import android.os.Bundle; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.balancesend.BalanceSendViewModelFactory; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenterInterface; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.balancesend.BalanceSendViewModelFactory; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendActivityActionListener.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendActivityActionListener.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendActivityActionListener.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendActivityActionListener.java index 9a05430d..718795c3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendActivityActionListener.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendActivityActionListener.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.view; +package com.remit.jmecustomer.features.balancesend.view; public interface BalanceSendActivityActionListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendQRScanFragment.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendQRScanFragment.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendQRScanFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendQRScanFragment.java index 22145796..757ab18f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendQRScanFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendQRScanFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.view; +package com.remit.jmecustomer.features.balancesend.view; import android.os.Bundle; import android.os.Handler; @@ -9,9 +9,9 @@ import androidx.annotation.NonNull; import androidx.lifecycle.ViewModelProvider; import com.google.android.gms.vision.barcode.Barcode; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.BarcodeGraphicTracker; -import com.swifttech.remit.jmecustomer.common.view.qrscanner.QRScannerFragment; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; +import com.remit.jmecustomer.common.view.qrscanner.BarcodeGraphicTracker; +import com.remit.jmecustomer.common.view.qrscanner.QRScannerFragment; import io.reactivex.subjects.PublishSubject; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationFragment.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationFragment.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationFragment.java index ffd075e4..2eabef51 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.view; +package com.remit.jmecustomer.features.balancesend.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,11 +12,11 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.balancesend.model.BalanceSendConfirmDTO; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; -import com.swifttech.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenterInterface; +import com.remit.jmecustomer.features.balancesend.model.BalanceSendConfirmDTO; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenter; +import com.remit.jmecustomer.features.balancesend.presenter.BalanceSendPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationLiveData.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationLiveData.java index ca58025e..19f2ffb9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/balancesend/view/BalanceSendVerificationLiveData.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.balancesend.view; +package com.remit.jmecustomer.features.balancesend.view; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.balancesend.model.BalanceSendConfirmDTO; +import com.remit.jmecustomer.features.balancesend.model.BalanceSendConfirmDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; public class BalanceSendVerificationLiveData { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/CashPickupViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/CashPickupViewModelFactory.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/CashPickupViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/CashPickupViewModelFactory.java index 0a4d40d8..2a184a8e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/CashPickupViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/CashPickupViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet; +package com.remit.jmecustomer.features.cashpickuptowallet; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.gateway.CashPickupToWalletGateway; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; +import com.remit.jmecustomer.features.cashpickuptowallet.gateway.CashPickupToWalletGateway; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; public class CashPickupViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/gateway/CashPickupToWalletGateway.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/gateway/CashPickupToWalletGateway.java similarity index 77% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/gateway/CashPickupToWalletGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/gateway/CashPickupToWalletGateway.java index c5be23bb..810102a2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/gateway/CashPickupToWalletGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/gateway/CashPickupToWalletGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.gateway; +package com.remit.jmecustomer.features.cashpickuptowallet.gateway; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletGatewayInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/model/CashPickupTxnDetailDTO.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/model/CashPickupTxnDetailDTO.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/model/CashPickupTxnDetailDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/model/CashPickupTxnDetailDTO.java index c12d07e1..0934c7e9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/model/CashPickupTxnDetailDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/model/CashPickupTxnDetailDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.model; +package com.remit.jmecustomer.features.cashpickuptowallet.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletGatewayInterface.java similarity index 72% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletGatewayInterface.java index 35d03c31..b1fdbc3d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter; +package com.remit.jmecustomer.features.cashpickuptowallet.presenter; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java index cc54bd61..657a4abe 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter; +package com.remit.jmecustomer.features.cashpickuptowallet.presenter; import androidx.appcompat.app.AppCompatActivity; @@ -6,17 +6,17 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.model.CashPickupTxnDetailDTO; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitTxnParam; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.cashpickuptowallet.model.CashPickupTxnDetailDTO; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.features.security.model.RemitTxnParam; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenterInterface.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenterInterface.java index c93f9e30..efd7d4d9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/presenter/CashPickupToWalletPresenterInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter; +package com.remit.jmecustomer.features.cashpickuptowallet.presenter; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.model.CashPickupTxnDetailDTO; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.cashpickuptowallet.model.CashPickupTxnDetailDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupToWalletActivity.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupToWalletActivity.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupToWalletActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupToWalletActivity.java index 8cc1fcf5..cd304c75 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupToWalletActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupToWalletActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.view; +package com.remit.jmecustomer.features.cashpickuptowallet.view; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -7,12 +7,12 @@ import androidx.viewpager.widget.ViewPager; import android.os.Bundle; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.CashPickupViewModelFactory; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.features.cashpickuptowallet.CashPickupViewModelFactory; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java index a41ea1da..c205f695 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/CashPickupTxnDetailFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.view; +package com.remit.jmecustomer.features.cashpickuptowallet.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -11,12 +11,12 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.model.CashPickupTxnDetailDTO; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; +import com.remit.jmecustomer.features.cashpickuptowallet.model.CashPickupTxnDetailDTO; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/SearchCashPickupTxnFragment.java b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/SearchCashPickupTxnFragment.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/SearchCashPickupTxnFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/SearchCashPickupTxnFragment.java index d1a44cb4..a3290ecc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/cashpickuptowallet/view/SearchCashPickupTxnFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/cashpickuptowallet/view/SearchCashPickupTxnFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.cashpickuptowallet.view; +package com.remit.jmecustomer.features.cashpickuptowallet.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -11,10 +11,10 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenter; +import com.remit.jmecustomer.features.cashpickuptowallet.presenter.CashPickupToWalletPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/ChangePassNPinViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/ChangePassNPinViewModelFactory.java similarity index 63% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/ChangePassNPinViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/ChangePassNPinViewModelFactory.java index a986e75f..6887c2fe 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/ChangePassNPinViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/ChangePassNPinViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin; +package com.remit.jmecustomer.features.changepassNPin; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.changepassNPin.gateway.ChangePassNPinGateway; -import com.swifttech.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPInV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinViewModel; +import com.remit.jmecustomer.features.changepassNPin.gateway.ChangePassNPinGateway; +import com.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPInV2PresenterInterface; +import com.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinViewModel; public class ChangePassNPinViewModelFactory implements ViewModelProvider.Factory { private final ChangePassNPInV2PresenterInterface.ChangePassNPinV2ContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/gateway/ChangePassNPinGateway.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/gateway/ChangePassNPinGateway.java similarity index 67% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/gateway/ChangePassNPinGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/gateway/ChangePassNPinGateway.java index 400d8a17..c02b5f5e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/gateway/ChangePassNPinGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/gateway/ChangePassNPinGateway.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin.gateway; +package com.remit.jmecustomer.features.changepassNPin.gateway; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; -import com.swifttech.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; -public class ChangePassNPinGateway extends PrivilegedGateway implements ChangePassNPinV2InteractorInterface.ChangePasswordV2GatewayInterface { +public class ChangePassNPinGateway extends PrivilegedGateway implements ChangePassNPinV2InteractorInterface.ChangePasswordV2GatewayInterface { @Override public Observable performPassNPinChangePassRequest( String auth, diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/model/ChangePassNPInResponse.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/model/ChangePassNPInResponse.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/model/ChangePassNPInResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/model/ChangePassNPInResponse.java index fdceede5..f57cb6f4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/model/ChangePassNPInResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/model/ChangePassNPInResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin.model; +package com.remit.jmecustomer.features.changepassNPin.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPInV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPInV2PresenterInterface.java similarity index 65% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPInV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPInV2PresenterInterface.java index 0885a4cb..f1e29a48 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPInV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPInV2PresenterInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin.presenter; +package com.remit.jmecustomer.features.changepassNPin.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; public interface ChangePassNPInV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinLiveData.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinLiveData.java index 1cb61b6f..887ed0ce 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin.presenter; +package com.remit.jmecustomer.features.changepassNPin.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinV2InteractorInterface.java similarity index 68% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinV2InteractorInterface.java index 345f8db2..cd02c99d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinV2InteractorInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin.presenter; +package com.remit.jmecustomer.features.changepassNPin.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java index 1bf51649..831a6917 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java @@ -1,22 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin.presenter; +package com.remit.jmecustomer.features.changepassNPin.presenter; -import androidx.appcompat.app.AppCompatActivity; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.changepassNPin.gateway.ChangePassNPinGateway; +import com.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.changepassNPin.gateway.ChangePassNPinGateway; -import com.swifttech.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; - -import io.reactivex.CompletableObserver; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; import io.reactivex.observers.DisposableObserver; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java index 798eb5d4..2f6cf3ad 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.changepassNPin.view; +package com.remit.jmecustomer.features.changepassNPin.view; import android.os.Bundle; import android.view.View; @@ -10,13 +10,13 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.changepassNPin.ChangePassNPinViewModelFactory; -import com.swifttech.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPInV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinLiveData; -import com.swifttech.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinViewModel; +import com.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPInV2PresenterInterface; +import com.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinLiveData; +import com.remit.jmecustomer.features.changepassNPin.presenter.ChangePassNPinViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.changepassNPin.ChangePassNPinViewModelFactory; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/ChangePasswordViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/ChangePasswordViewModelFactory.java similarity index 61% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/ChangePasswordViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/ChangePasswordViewModelFactory.java index 0d3d2276..2ad25416 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/ChangePasswordViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/ChangePasswordViewModelFactory.java @@ -1,16 +1,16 @@ -package com.swifttech.remit.jmecustomer.features.changepassword; +package com.remit.jmecustomer.features.changepassword; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.changepassword.gateway.ChangePasswordV2Gateway; -import com.swifttech.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2Presenter; -import com.swifttech.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2PresenterInterface; +import com.remit.jmecustomer.features.changepassword.gateway.ChangePasswordV2Gateway; +import com.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2Presenter; +import com.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2PresenterInterface; public class ChangePasswordViewModelFactory implements ViewModelProvider.Factory { - private final ChangePasswordV2PresenterInterface.ChangePasswordV2ContractInterface view; + private final ChangePasswordV2PresenterInterface.ChangePasswordV2ContractInterface view; public ChangePasswordViewModelFactory(ChangePasswordV2PresenterInterface.ChangePasswordV2ContractInterface view) { this.view=view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/gateway/ChangePasswordV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/gateway/ChangePasswordV2Gateway.java similarity index 63% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/gateway/ChangePasswordV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/gateway/ChangePasswordV2Gateway.java index 8851ad68..b1163bd0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/gateway/ChangePasswordV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/gateway/ChangePasswordV2Gateway.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.gateway; +package com.remit.jmecustomer.features.changepassword.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; -import com.swifttech.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; -public class ChangePasswordV2Gateway extends PrivilegedGateway implements ChangePasswordV2InteractorInterface.ChangePasswordV2GatewayInterface { +public class ChangePasswordV2Gateway extends PrivilegedGateway implements ChangePasswordV2InteractorInterface.ChangePasswordV2GatewayInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/model/ChangePasswordActivityV2APIResponse.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/model/ChangePasswordActivityV2APIResponse.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/model/ChangePasswordActivityV2APIResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/model/ChangePasswordActivityV2APIResponse.java index d3e51de0..33e49409 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/model/ChangePasswordActivityV2APIResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/model/ChangePasswordActivityV2APIResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.model; +package com.remit.jmecustomer.features.changepassword.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/model/ChangeSuccessModel.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/model/ChangeSuccessModel.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/model/ChangeSuccessModel.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/model/ChangeSuccessModel.java index 036ecb42..2378d7c1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/model/ChangeSuccessModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/model/ChangeSuccessModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.model; +package com.remit.jmecustomer.features.changepassword.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordLiveData.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordLiveData.java index 4025f087..499233e0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.presenter; +package com.remit.jmecustomer.features.changepassword.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2InteractorInterface.java similarity index 60% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2InteractorInterface.java index 31498b64..cc39e856 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2InteractorInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.presenter; +package com.remit.jmecustomer.features.changepassword.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java index afe44214..16cabe34 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java @@ -1,22 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.presenter; +package com.remit.jmecustomer.features.changepassword.presenter; -import androidx.appcompat.app.AppCompatActivity; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.changepassword.gateway.ChangePasswordV2Gateway; +import com.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.changepassword.gateway.ChangePasswordV2Gateway; -import com.swifttech.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; - -import io.reactivex.CompletableObserver; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; import io.reactivex.observers.DisposableObserver; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2PresenterInterface.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2PresenterInterface.java index 856d63f9..500ebcf8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2PresenterInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.presenter; +package com.remit.jmecustomer.features.changepassword.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; public interface ChangePasswordV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/view/UserPasswordChangeV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/changepassword/view/UserPasswordChangeV2Activity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/view/UserPasswordChangeV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/changepassword/view/UserPasswordChangeV2Activity.java index 8d335c62..6ed57ddd 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/view/UserPasswordChangeV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassword/view/UserPasswordChangeV2Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.changepassword.view; +package com.remit.jmecustomer.features.changepassword.view; import android.os.Bundle; import android.view.View; @@ -7,13 +7,13 @@ import android.widget.TextView; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.changepassword.ChangePasswordViewModelFactory; -import com.swifttech.remit.jmecustomer.features.changepassword.presenter.ChangePasswordLiveData; -import com.swifttech.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2Presenter; -import com.swifttech.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2PresenterInterface; +import com.remit.jmecustomer.features.changepassword.presenter.ChangePasswordLiveData; +import com.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2Presenter; +import com.remit.jmecustomer.features.changepassword.presenter.ChangePasswordV2PresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.changepassword.ChangePasswordViewModelFactory; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/ChangePinViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/ChangePinViewModelFactory.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/ChangePinViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/changetxnpin/ChangePinViewModelFactory.java index 6213aca4..1aa5a6a8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/ChangePinViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/ChangePinViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.changetxnpin; +package com.remit.jmecustomer.features.changetxnpin; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.changetxnpin.gateway.ChangePinGateway; -import com.swifttech.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2Presenter; -import com.swifttech.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2PresenterInterface; +import com.remit.jmecustomer.features.changetxnpin.gateway.ChangePinGateway; +import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2Presenter; +import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2PresenterInterface; public class ChangePinViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/gateway/ChangePinGateway.java b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/gateway/ChangePinGateway.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/gateway/ChangePinGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/changetxnpin/gateway/ChangePinGateway.java index dd5c5d4d..cb107fa7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/gateway/ChangePinGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/gateway/ChangePinGateway.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.changetxnpin.gateway; +package com.remit.jmecustomer.features.changetxnpin.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; import okhttp3.ResponseBody; -public class ChangePinGateway extends PrivilegedGateway implements ChangePinV2InteractorInterface.ChangePinV2GatewayInterface { +public class ChangePinGateway extends PrivilegedGateway implements ChangePinV2InteractorInterface.ChangePinV2GatewayInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinLiveData.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinLiveData.java index c8ead467..3a5249d4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.changetxnpin.presenter; +package com.remit.jmecustomer.features.changetxnpin.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2InteractorInterface.java similarity index 69% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2InteractorInterface.java index b71c1fef..d7dbaed5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2InteractorInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.changetxnpin.presenter; +package com.remit.jmecustomer.features.changetxnpin.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java index a94dd6af..6f9441b0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2Presenter.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.changetxnpin.presenter; - -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +package com.remit.jmecustomer.features.changetxnpin.presenter; + +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2PresenterInterface.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2PresenterInterface.java index e56db21f..fc5b58d9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/presenter/ChangePinV2PresenterInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.changetxnpin.presenter; +package com.remit.jmecustomer.features.changetxnpin.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; public interface ChangePinV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java index 20b7bb10..bf00f31c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changetxnpin/view/ChangeTxnPinActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.changetxnpin.view; +package com.remit.jmecustomer.features.changetxnpin.view; import android.os.Bundle; import android.view.View; @@ -10,13 +10,13 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.changetxnpin.ChangePinViewModelFactory; -import com.swifttech.remit.jmecustomer.features.changetxnpin.presenter.ChangePinLiveData; -import com.swifttech.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2Presenter; -import com.swifttech.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2PresenterInterface; +import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinLiveData; +import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2Presenter; +import com.remit.jmecustomer.features.changetxnpin.presenter.ChangePinV2PresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.changetxnpin.ChangePinViewModelFactory; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/CustomerSupportContract.java b/app/src/main/java/com/remit/jmecustomer/features/customersupport/CustomerSupportContract.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/CustomerSupportContract.java rename to app/src/main/java/com/remit/jmecustomer/features/customersupport/CustomerSupportContract.java index a5400f7b..af4cc843 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/CustomerSupportContract.java +++ b/app/src/main/java/com/remit/jmecustomer/features/customersupport/CustomerSupportContract.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.customersupport; +package com.remit.jmecustomer.features.customersupport; -import com.swifttech.remit.jmecustomer.utils.https.APIRequestErrorReturn; +import com.remit.jmecustomer.utils.https.APIRequestErrorReturn; /** * Created by FMI-LT-17 on 2/6/2018. diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/presenter/CustomerSupportPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/customersupport/presenter/CustomerSupportPresenter.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/presenter/CustomerSupportPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/customersupport/presenter/CustomerSupportPresenter.java index 08287b05..3c2558d3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/presenter/CustomerSupportPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/customersupport/presenter/CustomerSupportPresenter.java @@ -1,16 +1,16 @@ -package com.swifttech.remit.jmecustomer.features.customersupport.presenter; +package com.remit.jmecustomer.features.customersupport.presenter; -import com.swifttech.remit.jmecustomer.features.customersupport.CustomerSupportContract; -import com.swifttech.remit.jmecustomer.utils.https.APIRequestErrorReturn; +import com.remit.jmecustomer.features.customersupport.CustomerSupportContract; +import com.remit.jmecustomer.utils.https.APIRequestErrorReturn; import java.io.IOException; -import static com.swifttech.remit.jmecustomer.utils.Constants.ERROR; -import static com.swifttech.remit.jmecustomer.utils.Constants.GENERAL_ENQUIRY; -import static com.swifttech.remit.jmecustomer.utils.Constants.INTERNET; -import static com.swifttech.remit.jmecustomer.utils.Constants.OTHER_ERROR; -import static com.swifttech.remit.jmecustomer.utils.Constants.SUGGESTION_FEEDBACK; -import static com.swifttech.remit.jmecustomer.utils.Constants.TRANSACTION_AMENDMENT; +import static com.remit.jmecustomer.utils.Constants.ERROR; +import static com.remit.jmecustomer.utils.Constants.GENERAL_ENQUIRY; +import static com.remit.jmecustomer.utils.Constants.INTERNET; +import static com.remit.jmecustomer.utils.Constants.OTHER_ERROR; +import static com.remit.jmecustomer.utils.Constants.SUGGESTION_FEEDBACK; +import static com.remit.jmecustomer.utils.Constants.TRANSACTION_AMENDMENT; /** * Created by FMI-LT-17 on 2/6/2018. diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java b/app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java index 5ed5f19a..50229bd9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.customersupport.view; +package com.remit.jmecustomer.features.customersupport.view; import android.content.Intent; @@ -13,7 +13,7 @@ import android.view.ViewGroup; import android.widget.TextView; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; @@ -75,6 +75,16 @@ public class CustomerSupportFragment extends BottomSheetDialogFragment { startActivity(call); break; + case R.id.viewFaceBook: + try { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/jmeremit")); + startActivity(intent); + } catch(Exception e) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/jmeremit/"))); + } + break; + + case R.id.btnCancel: this.dismiss(); break; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/adapter/PaymentModeRvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/adapter/PaymentModeRvAdapter.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/adapter/PaymentModeRvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/adapter/PaymentModeRvAdapter.java index 32211b54..8942f75a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/adapter/PaymentModeRvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/adapter/PaymentModeRvAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.adapter; +package com.remit.jmecustomer.features.exrate.adapter; import android.view.LayoutInflater; import android.view.View; @@ -6,11 +6,11 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.exrate.model.PaymentModeMapper; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; -import com.swifttech.remit.jmecustomer.features.exrate.view.PaymentModeViewHolder; -import com.swifttech.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.exrate.model.PaymentModeMapper; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.features.exrate.view.PaymentModeViewHolder; +import com.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/gateway/ExchangeRateGateway.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/gateway/ExchangeRateGateway.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/gateway/ExchangeRateGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/gateway/ExchangeRateGateway.java index 03046244..308fa00a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/gateway/ExchangeRateGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/gateway/ExchangeRateGateway.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.exrate.gateway; - -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.presenter.ExchangeRateInteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +package com.remit.jmecustomer.features.exrate.gateway; + +import com.remit.jmecustomer.features.exrate.presenter.ExchangeRateInteractorInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import java.util.ArrayList; @@ -14,7 +14,7 @@ import java.util.List; import io.reactivex.Observable; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; +import static com.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; public class ExchangeRateGateway extends PrivilegedGateway implements ExchangeRateInteractorInterface.ExchangeRateGatewayInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/PaymentModeMapper.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/PaymentModeMapper.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/PaymentModeMapper.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/PaymentModeMapper.java index 721968e4..a326177b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/PaymentModeMapper.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/PaymentModeMapper.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model; +package com.remit.jmecustomer.features.exrate.model; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class PaymentModeMapper { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentService.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentService.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentService.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentService.java index 9946cdb0..92b6371b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentService.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentService.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueApiResponse.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueApiResponse.java index 26bda6c6..f3609950 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueModel.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueModel.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueModel.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueModel.java index 8ccbc01f..17836b83 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/CountryPaymentServiceSeedValueModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationApiResponse.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationApiResponse.java index 932b4054..d953c014 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationModel.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationModel.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationModel.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationModel.java index 58b39834..d9f64ccc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/ExchangeCalculationModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/GenericApiResponseModel.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/GenericApiResponseModel.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/GenericApiResponseModel.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/GenericApiResponseModel.java index 59d981e3..c3e5e7cc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/GenericApiResponseModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/GenericApiResponseModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/PaymentMode.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/PaymentMode.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/PaymentMode.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/PaymentMode.java index fd5413ca..08bca219 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/PaymentMode.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/PaymentMode.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/PaymentServiceApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/PaymentServiceApiResponse.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/PaymentServiceApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/PaymentServiceApiResponse.java index 2071f405..6bc270b3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/model/datav2/PaymentServiceApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/model/datav2/PaymentServiceApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.model.datav2; +package com.remit.jmecustomer.features.exrate.model.datav2; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRateInteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRateInteractorInterface.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRateInteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRateInteractorInterface.java index 6c07ae41..bcc1941b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRateInteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRateInteractorInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.exrate.presenter; +package com.remit.jmecustomer.features.exrate.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenter.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenter.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenter.java index e1d82aa2..63c0a8ef 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenter.java @@ -1,19 +1,19 @@ -package com.swifttech.remit.jmecustomer.features.exrate.presenter; +package com.remit.jmecustomer.features.exrate.presenter; import android.os.Handler; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationModel; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationModel; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import java.math.RoundingMode; import java.text.DecimalFormat; @@ -27,7 +27,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; +import static com.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; public class ExchangeRatePresenter extends BasePresenter implements ExchangeRatePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenterInterface.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenterInterface.java index 0cba9b7f..cdf753ff 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/presenter/ExchangeRatePresenterInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.exrate.presenter; +package com.remit.jmecustomer.features.exrate.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/ExchangeRateActivity.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/view/ExchangeRateActivity.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/ExchangeRateActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/view/ExchangeRateActivity.java index 78c5b1bb..7c783132 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/ExchangeRateActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/view/ExchangeRateActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.view; +package com.remit.jmecustomer.features.exrate.view; import android.graphics.Rect; import androidx.core.view.GestureDetectorCompat; @@ -21,18 +21,18 @@ import android.widget.ImageView; import android.widget.ScrollView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog; -import com.swifttech.remit.jmecustomer.features.exrate.adapter.PaymentModeRvAdapter; -import com.swifttech.remit.jmecustomer.features.exrate.gateway.ExchangeRateGateway; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; -import com.swifttech.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenter; -import com.swifttech.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenterInterface; +import com.remit.jmecustomer.features.exrate.adapter.PaymentModeRvAdapter; +import com.remit.jmecustomer.features.exrate.gateway.ExchangeRateGateway; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenter; +import com.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/PaymentModeViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/view/PaymentModeViewHolder.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/PaymentModeViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/view/PaymentModeViewHolder.java index 6276065a..fc46d968 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/PaymentModeViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/view/PaymentModeViewHolder.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.view; +package com.remit.jmecustomer.features.exrate.view; import androidx.appcompat.widget.AppCompatImageView; import androidx.core.content.ContextCompat; @@ -6,8 +6,8 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/SelectedRedBorderDecoration.java b/app/src/main/java/com/remit/jmecustomer/features/exrate/view/SelectedRedBorderDecoration.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/SelectedRedBorderDecoration.java rename to app/src/main/java/com/remit/jmecustomer/features/exrate/view/SelectedRedBorderDecoration.java index 8a5ac809..29d3f7b2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/exrate/view/SelectedRedBorderDecoration.java +++ b/app/src/main/java/com/remit/jmecustomer/features/exrate/view/SelectedRedBorderDecoration.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.exrate.view; +package com.remit.jmecustomer.features.exrate.view; import android.annotation.SuppressLint; import android.content.Context; @@ -9,8 +9,8 @@ import android.os.Build; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.utils.Utils; public class SelectedRedBorderDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/HomeParentViewContractV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/HomeParentViewContractV2.java similarity index 78% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/HomeParentViewContractV2.java rename to app/src/main/java/com/remit/jmecustomer/features/home/HomeParentViewContractV2.java index 8eba3eee..8ef32c95 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/HomeParentViewContractV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/HomeParentViewContractV2.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.home; +package com.remit.jmecustomer.features.home; import android.graphics.Rect; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeV2PresenterInterface; +import com.remit.jmecustomer.features.home.presenter.HomeV2PresenterInterface; public interface HomeParentViewContractV2 { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/HomeViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/home/HomeViewModelFactory.java similarity index 75% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/HomeViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/home/HomeViewModelFactory.java index 24ea4e86..8dd6ad1e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/HomeViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/HomeViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.home; +package com.remit.jmecustomer.features.home; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeV2InteractorInterface; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeViewModel; +import com.remit.jmecustomer.features.home.presenter.HomeV2InteractorInterface; +import com.remit.jmecustomer.features.home.presenter.HomeV2PresenterInterface; +import com.remit.jmecustomer.features.home.presenter.HomeViewModel; public class HomeViewModelFactory implements ViewModelProvider.Factory { private final HomeV2PresenterInterface.HomeV2ContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/adapters/HomeMenuRvAdapterV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/adapters/HomeMenuRvAdapterV2.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/adapters/HomeMenuRvAdapterV2.java rename to app/src/main/java/com/remit/jmecustomer/features/home/adapters/HomeMenuRvAdapterV2.java index c5aa995d..49eb6b54 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/adapters/HomeMenuRvAdapterV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/adapters/HomeMenuRvAdapterV2.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.home.adapters; +package com.remit.jmecustomer.features.home.adapters; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.home.model.MenuItem; -import com.swifttech.remit.jmecustomer.features.home.view.HomeMenuItemViewHolderV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.home.model.MenuItem; +import com.remit.jmecustomer.features.home.view.HomeMenuItemViewHolderV2; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java index 36a0178d..163262af 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java @@ -1,16 +1,16 @@ -package com.swifttech.remit.jmecustomer.features.home.gateway; +package com.remit.jmecustomer.features.home.gateway; import android.content.SharedPreferences; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoModelV2; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoV2DataApiResponse; -import com.swifttech.remit.jmecustomer.features.home.model.UserCachedState; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.home.presenter.HomeV2InteractorInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.home.model.UserInfoModelV2; +import com.remit.jmecustomer.features.home.model.UserInfoV2DataApiResponse; +import com.remit.jmecustomer.features.home.model.UserCachedState; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/AppUpdateModel.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/AppUpdateModel.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/AppUpdateModel.java rename to app/src/main/java/com/remit/jmecustomer/features/home/model/AppUpdateModel.java index c20c7eb6..abedce77 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/AppUpdateModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/AppUpdateModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.model; +package com.remit.jmecustomer.features.home.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/HomeNotificationViewDTO.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/HomeNotificationViewDTO.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/HomeNotificationViewDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/home/model/HomeNotificationViewDTO.java index 1735dcff..f6d97647 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/HomeNotificationViewDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/HomeNotificationViewDTO.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.home.model; +package com.remit.jmecustomer.features.home.model; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeNotificationHandler; +import com.remit.jmecustomer.features.home.presenter.HomeNotificationHandler; /** * @author Preyea R. Regmi diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/HomeViewRelatedDTOV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/HomeViewRelatedDTOV2.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/HomeViewRelatedDTOV2.java rename to app/src/main/java/com/remit/jmecustomer/features/home/model/HomeViewRelatedDTOV2.java index bb5d9831..9b229377 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/HomeViewRelatedDTOV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/HomeViewRelatedDTOV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.model; +package com.remit.jmecustomer.features.home.model; public class HomeViewRelatedDTOV2 { @@ -11,6 +11,7 @@ public class HomeViewRelatedDTOV2 { private String userName; private String availableBalance; private String rewardPoint; + private String referralCode; @@ -21,7 +22,7 @@ public class HomeViewRelatedDTOV2 { } - public HomeViewRelatedDTOV2(String userName, String availableBalance,String yearlyLimit, String rewardPoint , String bankName,String walletNo, HomeNotificationViewDTO homeNotificationViewDTO,boolean shouldShowTermsAndCondition) { + public HomeViewRelatedDTOV2(String userName, String availableBalance,String yearlyLimit, String rewardPoint , String bankName,String walletNo, HomeNotificationViewDTO homeNotificationViewDTO,boolean shouldShowTermsAndCondition,String referralCode) { this.userName = userName; this.availableBalance = availableBalance; this.yearlyLimit=yearlyLimit; @@ -31,6 +32,7 @@ public class HomeViewRelatedDTOV2 { this.bankName=bankName; this.walletNo=walletNo; this.shouldShowTermsAndCondition=shouldShowTermsAndCondition; + this.referralCode=referralCode; } public String getUserName() { return userName; @@ -66,5 +68,7 @@ public class HomeViewRelatedDTOV2 { return shouldShowTermsAndCondition; } - + public String getReferralCode() { + return referralCode; + } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/MenuItem.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/MenuItem.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/MenuItem.java rename to app/src/main/java/com/remit/jmecustomer/features/home/model/MenuItem.java index 78c43a94..b22635e1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/MenuItem.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/MenuItem.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.model; +package com.remit.jmecustomer.features.home.model; /** diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserCachedState.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserCachedState.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserCachedState.java rename to app/src/main/java/com/remit/jmecustomer/features/home/model/UserCachedState.java index 625ba897..0911d5c6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserCachedState.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserCachedState.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.model; +package com.remit.jmecustomer.features.home.model; /** * In Memory Cache for user related data diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoModelV2.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java rename to app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoModelV2.java index 0849825f..81936367 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoModelV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.model; +package com.remit.jmecustomer.features.home.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoV2DataApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoV2DataApiResponse.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoV2DataApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoV2DataApiResponse.java index eec66c4b..d38842dc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoV2DataApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/model/UserInfoV2DataApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.model; +package com.remit.jmecustomer.features.home.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java rename to app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java index c0b1e363..3dbe45d5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java @@ -1,12 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.home.presenter; +package com.remit.jmecustomer.features.home.presenter; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; +import com.remit.jmecustomer.features.home.view.HomeFragmentV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; /** * @author Preyea R. Regmi - * This class is responsbile for generating appropriate notification related data that is shown in {@link com.swifttech.remit.jmecustomer.features.home.view.HomeFragmentV2} + * This class is responsbile for generating appropriate notification related data that is shown in {@link HomeFragmentV2} * Currently two set of Notifications are handled. * 1) Redirect Notification * 2) Registration Notification diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeV2InteractorInterface.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeV2InteractorInterface.java index 325e4bf4..b415ac6b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeV2InteractorInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.home.presenter; +package com.remit.jmecustomer.features.home.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoModelV2; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoV2DataApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.home.model.UserInfoModelV2; +import com.remit.jmecustomer.features.home.model.UserInfoV2DataApiResponse; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java similarity index 78% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java index 0901be0e..0d4c54e0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java @@ -1,14 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.home.presenter; +package com.remit.jmecustomer.features.home.presenter; import android.content.Context; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; -import com.swifttech.remit.jmecustomer.features.home.model.HomeViewRelatedDTOV2; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; +import com.remit.jmecustomer.features.home.model.HomeViewRelatedDTOV2; public interface HomeV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java index 9e919e28..1db3a163 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java @@ -1,26 +1,26 @@ -package com.swifttech.remit.jmecustomer.features.home.presenter; +package com.remit.jmecustomer.features.home.presenter; import android.util.Log; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.home.model.AppUpdateModel; -import com.swifttech.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; -import com.swifttech.remit.jmecustomer.features.home.model.HomeViewRelatedDTOV2; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoModelV2; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.HTTPConstants; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.SessionExpiredException; -import com.swifttech.remit.jmecustomer.utils.https.UserSessionObserverResponse; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.home.model.AppUpdateModel; +import com.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; +import com.remit.jmecustomer.features.home.model.HomeViewRelatedDTOV2; +import com.remit.jmecustomer.features.home.model.UserInfoModelV2; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.HTTPConstants; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.utils.https.SessionExpiredException; +import com.remit.jmecustomer.utils.https.UserSessionObserverResponse; import java.util.concurrent.TimeUnit; @@ -272,6 +272,9 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter @Override protected void onSuccess(UserInfoModelV2 userInfoModelV2) { gateway.updateUserInfoInBatch(userInfoModelV2); + if(userInfoModelV2.isBiometricLogin()==false && !userInfoModelV2.getBiometricLoginType().equals(Constants.FINGER_PRINT)){ + gateway.setFingerPrintLoginStatus(false); + } String fullName = userInfoModelV2.getFirstName(); @@ -281,7 +284,6 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter boolean shouldShowTermsAndCondition = "True".equalsIgnoreCase(userInfoModelV2.getAgreeYn()); - Log.d(TAG, "hasOtp verified? : " + userInfoModelV2.isEmailVerified()); notificationViewDTO = new HomeNotificationHandler( @@ -305,7 +307,8 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getWalletNumber(), notificationViewDTO, - shouldShowTermsAndCondition + shouldShowTermsAndCondition, + userInfoModelV2.getReferralCode() )); //If no notification is generated then we can show privileged Operation View @@ -317,7 +320,7 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter if (model.getOS().equalsIgnoreCase("ANDROID")) androidAppUpdateModel = model; } -// checkIfUpdateIsRequired(androidAppUpdateModel); + checkIfUpdateIsRequired(androidAppUpdateModel); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java similarity index 73% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java index e8723529..946d2a66 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java @@ -1,11 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.home.view; +package com.remit.jmecustomer.features.home.view; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; -import android.graphics.Color; import android.graphics.Rect; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.text.Html; @@ -18,52 +15,49 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; -import androidx.appcompat.app.AlertDialog; -import androidx.core.content.ContextCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProvider; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.navigation.NavigationView; import com.google.firebase.messaging.FirebaseMessaging; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.features.aboutscreen.view.AboutJMERemit; -import com.swifttech.remit.jmecustomer.features.agentslisting.view.AgentListV2Activity; -import com.swifttech.remit.jmecustomer.features.appupdate.AppUpdateActivity; -import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.view.CashPickupToWalletActivity; -import com.swifttech.remit.jmecustomer.features.changepassNPin.view.ChangePassNPinActivity; -import com.swifttech.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity; -import com.swifttech.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity; -import com.swifttech.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; -import com.swifttech.remit.jmecustomer.features.exrate.view.ExchangeRateActivity; -import com.swifttech.remit.jmecustomer.features.home.HomeParentViewContractV2; -import com.swifttech.remit.jmecustomer.features.home.HomeViewModelFactory; -import com.swifttech.remit.jmecustomer.features.home.gateway.HomeV2Gateway; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeViewModel; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.DimBackgroundView; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.ExistingKYCV3Activity; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; -import com.swifttech.remit.jmecustomer.features.notice.view.NoticeActivity; -import com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientlisting.RecipientListingActivity; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3.RecipientListingV3Activity; -import com.swifttech.remit.jmecustomer.features.renewId.view.RenewIdActivity; -import com.swifttech.remit.jmecustomer.features.settings.view.FingerprintEnablePromptActivity; -import com.swifttech.remit.jmecustomer.features.settings.view.SettingsView; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; -import com.swifttech.remit.jmecustomer.features.userprofile.view.ProfileActivity; -import com.swifttech.remit.jmecustomer.features.walletstatement.view.WalletStatementV2Activity; -import com.swifttech.remit.jmecustomer.features.withdraw.view.WithdrawActivity; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.aboutscreen.view.AboutJMERemit; +import com.remit.jmecustomer.features.agentslisting.view.AgentListV2Activity; +import com.remit.jmecustomer.features.appupdate.AppUpdateActivity; +import com.remit.jmecustomer.features.cashpickuptowallet.view.CashPickupToWalletActivity; +import com.remit.jmecustomer.features.changepassNPin.view.ChangePassNPinActivity; +import com.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity; +import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity; +import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; +import com.remit.jmecustomer.features.exrate.view.ExchangeRateActivity; +import com.remit.jmecustomer.features.home.gateway.HomeV2Gateway; +import com.remit.jmecustomer.features.home.presenter.HomeV2PresenterInterface; +import com.remit.jmecustomer.features.home.presenter.HomeViewModel; +import com.remit.jmecustomer.features.home.view.notifications.DimBackgroundView; +import com.remit.jmecustomer.features.notice.view.NoticeActivity; +import com.remit.jmecustomer.features.recipientlisting.view.recipientlisting.RecipientListingActivity; +import com.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3.RecipientListingV3Activity; +import com.remit.jmecustomer.features.renewId.view.RenewIdActivity; +import com.remit.jmecustomer.features.settings.view.FingerprintEnablePromptActivity; +import com.remit.jmecustomer.features.settings.view.SettingsView; +import com.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; +import com.remit.jmecustomer.features.userprofile.view.ProfileActivity; +import com.remit.jmecustomer.features.walletstatement.view.WalletStatementV2Activity; +import com.remit.jmecustomer.features.withdraw.view.WithdrawActivity; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.features.home.HomeParentViewContractV2; +import com.remit.jmecustomer.features.home.HomeViewModelFactory; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.ExistingKYCV3Activity; +import com.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; +import com.remit.jmecustomer.utils.Utils; import butterknife.BindView; import butterknife.ButterKnife; @@ -72,9 +66,12 @@ import butterknife.OnClick; public class HomeActivityV2 extends BaseActivity implements HomeParentViewContractV2, HomeV2PresenterInterface.HomeV2ContractInterface { - private static final int APP_UPDATE_REQUEST = 9846; public static final String BUNDLE_ACTION_FETCH_ALL_DATA = "bundleActionFetchAllData"; - private static final String TAG =HomeActivityV2.class.getSimpleName() ; + public static final String PROMPT_FINGERPRINT_BUNDLE_FLAG = "bundleKeyPromptFlag"; + private static final int APP_UPDATE_REQUEST = 9846; + private static final String TAG = HomeActivityV2.class.getSimpleName(); + private static int WITHDRAW_AMOUNT_REQUEST_CODE = 24943; + private static int SEND_MONEY_REQUEST_CODE = 24944; @BindView(R.id.nav_drawer) NavigationView nav_drawer; @BindView(R.id.iv_help) @@ -95,26 +92,18 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra View logout; @BindView(R.id.iv_close) ImageView iv_close; - @BindView(R.id.content_view) ViewGroup content_view; - - @BindView(R.id.notificationCounterTxtView) TextView notificationCounterTxtView; - private Fragment currentFragment; private FragmentManager manager; // private HomeV2PresenterInterface presenter; private HomeViewModel viewModel; - private static int WITHDRAW_AMOUNT_REQUEST_CODE = 24943; - private static int SEND_MONEY_REQUEST_CODE = 24944; - public static final String PROMPT_FINGERPRINT_BUNDLE_FLAG = "bundleKeyPromptFlag"; private Rect notificationViewBoundry; private boolean isNotificaitonViewActive; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -132,8 +121,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra .addOnCompleteListener(task -> { if (task.isSuccessful()) { String token = task.getResult(); - if(BuildConfig.DEBUG){ - Log.d(TAG, "registerFcmToken: "+token); + if (BuildConfig.DEBUG) { + Log.d(TAG, "registerFcmToken: " + token); } viewModel.setNewToken(token); RemitApplication.getStorage().edit().putString(PrefKeys.USER_FCM_ID, token); @@ -242,6 +231,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra startActivity(new Intent(this, SettingsView.class)); break; case R.id.view_logout: + showDrawer(false); showLogoutConfirmationDialog(); break; case R.id.iv_close: @@ -253,54 +243,51 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra private void showLogoutConfirmationDialog() { - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); - - builder.setTitle(getString(R.string.logout_confirmation_title_text)) + GenericPromptDialog genericPromptDialog = new GenericPromptDialog(); + genericPromptDialog.setTitleMessage(getString(R.string.logout_text)); + genericPromptDialog.setBodyMessage(getString(R.string.logout_confirmation_text)); + genericPromptDialog.setIconsRes(-1); + genericPromptDialog.setCancellable(true); + genericPromptDialog.setPositiveBtnString(getString(R.string.yes_text)); + genericPromptDialog.setNegativeBtnString(getString(R.string.no_text)); + genericPromptDialog.setListener(new GenericPromptDialog.GenericDialogPromptListener() { + @Override + public void onNegativeBtnPressed() { - .setMessage(getString(R.string.logout_confirmation_text)) - .setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { -// changeLocaleTest(); - performLogout(); - } - }) - .setNegativeButton(getString(R.string.no_text), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - dialogInterface.dismiss(); - } - }); + } - AlertDialog alert = builder.create(); - alert.show(); + @Override + public void onPositiveBtnPressed() { + performLogout(); + } + }); + if (!genericPromptDialog.isAdded()) + genericPromptDialog.show(getSupportFragmentManager(), "PROMPTSENDMONEY"); - alert.getButton(DialogInterface.BUTTON_POSITIVE).setAllCaps(false); - alert.getButton(DialogInterface.BUTTON_NEGATIVE).setAllCaps(false); - alert.getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(ContextCompat.getColor(this, R.color.black)); - alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(this, R.color.colorPrimary)); } private void showExitConfirmationDialog() { - final MaterialAlertDialogBuilder confimationAlertDialog = new MaterialAlertDialogBuilder(this); - confimationAlertDialog.setTitle(R.string.exit_confirmation_text); - confimationAlertDialog.setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() { - @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN) + GenericPromptDialog genericPromptDialog = new GenericPromptDialog(); + genericPromptDialog.setTitleMessage(getString(R.string.exit_text)); + genericPromptDialog.setBodyMessage(getString(R.string.exit_confirmation_text)); + genericPromptDialog.setIconsRes(-1); + genericPromptDialog.setCancellable(true); + genericPromptDialog.setPositiveBtnString(getString(R.string.yes_text)); + genericPromptDialog.setNegativeBtnString(getString(R.string.no_text)); + genericPromptDialog.setListener(new GenericPromptDialog.GenericDialogPromptListener() { @Override - public void onClick(DialogInterface dialogInterface, int i) { - finishAffinity(); + public void onNegativeBtnPressed() { + } - }); - confimationAlertDialog.setNegativeButton(getString(R.string.no_text), new DialogInterface.OnClickListener() { + @Override - public void onClick(DialogInterface dialogInterface, int i) { - confimationAlertDialog.setCancelable(true); + public void onPositiveBtnPressed() { + finishAffinity(); } }); + if (!genericPromptDialog.isAdded()) + genericPromptDialog.show(getSupportFragmentManager(), "EXITAPP"); - AlertDialog alertDialog = confimationAlertDialog.create(); - alertDialog.show(); - alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(Color.BLACK); } @@ -515,7 +502,6 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra } - @Override public void performLogout() { viewModel.clearAllData(); @@ -594,7 +580,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra private void showFetaureComingSoon() { - CustomAlertDialog customAlertDialog = new CustomAlertDialog(); + CustomAlertDialog customAlertDialog = new CustomAlertDialog(); customAlertDialog.setAlertType(CustomAlertDialog.AlertType.ALERT); customAlertDialog.setMessage(getString(R.string.featureCommingSoon_text)); FragmentManager fragmentManager = getSupportFragmentManager(); @@ -603,14 +589,14 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra } @Override - public void onBackPressed() { - GenericEditTextPromptDialog genericEditTextPromptDialog=null; - if (currentFragment instanceof HomeFragmentV2){ - genericEditTextPromptDialog=((HomeFragmentV2) currentFragment).getGenericPromptDialog(); + public void onBackPressed() { + GenericEditTextPromptDialog genericEditTextPromptDialog = null; + if (currentFragment instanceof HomeFragmentV2) { + genericEditTextPromptDialog = ((HomeFragmentV2) currentFragment).getGenericPromptDialog(); } - if(genericEditTextPromptDialog!=null){ + if (genericEditTextPromptDialog != null) { genericEditTextPromptDialog.dismiss(); - }else{ + } else { showExitConfirmationDialog(); } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeFragmentV2.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/HomeFragmentV2.java index b019d9d0..3f49543d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeFragmentV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view; +package com.remit.jmecustomer.features.home.view; import android.graphics.Rect; import android.os.Bundle; @@ -22,25 +22,26 @@ import androidx.transition.Transition; import androidx.transition.TransitionListenerAdapter; import androidx.transition.TransitionManager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.LockableScrollView; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.features.home.HomeParentViewContractV2; -import com.swifttech.remit.jmecustomer.features.home.adapters.HomeMenuRvAdapterV2; -import com.swifttech.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; -import com.swifttech.remit.jmecustomer.features.home.model.MenuItem; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeViewModel; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.ChangePassNotificationView; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.ChangePinNPassNotificationView; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.ChangePinNotificationView; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.EmailNotVerifiedView; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.HomeNotificiationViewFactory; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.KYCNotSubmittedNotificationView; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.KYCNotVerifiedNotificationView; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.NotificaitonBaseView; -import com.swifttech.remit.jmecustomer.features.home.view.notifications.TermsNotAcceptedNotificationView; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; +import com.remit.jmecustomer.features.home.adapters.HomeMenuRvAdapterV2; +import com.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; +import com.remit.jmecustomer.features.home.model.HomeViewRelatedDTOV2; +import com.remit.jmecustomer.features.home.model.MenuItem; +import com.remit.jmecustomer.features.home.presenter.HomeViewModel; +import com.remit.jmecustomer.features.home.view.notifications.ChangePassNotificationView; +import com.remit.jmecustomer.features.home.view.notifications.ChangePinNPassNotificationView; +import com.remit.jmecustomer.features.home.view.notifications.ChangePinNotificationView; +import com.remit.jmecustomer.features.home.view.notifications.EmailNotVerifiedView; +import com.remit.jmecustomer.features.home.view.notifications.HomeNotificiationViewFactory; +import com.remit.jmecustomer.features.home.view.notifications.KYCNotSubmittedNotificationView; +import com.remit.jmecustomer.features.home.view.notifications.KYCNotVerifiedNotificationView; +import com.remit.jmecustomer.features.home.view.notifications.NotificaitonBaseView; +import com.remit.jmecustomer.features.home.view.notifications.TermsNotAcceptedNotificationView; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.LockableScrollView; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.features.home.HomeParentViewContractV2; +import com.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; import java.util.ArrayList; import java.util.List; @@ -174,8 +175,7 @@ public class HomeFragmentV2 extends BaseFragment implements private void performDefaultAction(Bundle savedInupdateInfostanceState) { homeViewModel.subscribeToHomeRelatedDataEvent().observe(getViewLifecycleOwner(), homeViewRelatedDTOV2 -> { - updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getYearlyLimit(), homeViewRelatedDTOV2.getRewardPoint()); - setWalletNo(homeViewRelatedDTOV2.getWalletNo(), homeViewRelatedDTOV2.getBankName()); + updateInfo(homeViewRelatedDTOV2); showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO()); // if (homeViewRelatedDTOV2.shouldShowTermsAndCondition()) // TermsAndConditionAcitivity.startTermsAndCondition(getActivity()); @@ -223,16 +223,16 @@ public class HomeFragmentV2 extends BaseFragment implements } - public void updateInfo(String userName, String availableBalance, String yearlyLimit, String rewardPoint) { + public void updateInfo(HomeViewRelatedDTOV2 homeViewRelatedDTOV2) { swiperefresh.setRefreshing(false); // tv_rewardpoint.setText(Utils.formatCurrencyWithoutTruncatingDecimal(rewardPoint)); // tv_rewardpoint.setVisibility(View.VISIBLE); // lb_rewardpoint.setVisibility(View.VISIBLE); - tv_namelabel.setText(userName); - tv_yearly_remaining.setText(availableBalance); - tv_wallet_no.setText(yearlyLimit); + tv_namelabel.setText(homeViewRelatedDTOV2.getUserName()); + tv_yearly_remaining.setText(homeViewRelatedDTOV2.getAvailableBalance()); + tv_wallet_no.setText(homeViewRelatedDTOV2.getReferralCode()); } @@ -251,7 +251,7 @@ public class HomeFragmentV2 extends BaseFragment implements if (notificationView == null) return; - else if (notificationView instanceof KYCNotSubmittedNotificationView||notificationView instanceof TermsNotAcceptedNotificationView) { + else if (notificationView instanceof KYCNotSubmittedNotificationView ||notificationView instanceof TermsNotAcceptedNotificationView) { homeViewModel.showKYCScreen(); } else if (notificationView instanceof KYCNotVerifiedNotificationView) { // homeViewModel.showKYCScreen(); @@ -272,20 +272,6 @@ public class HomeFragmentV2 extends BaseFragment implements } - public void setWalletNo(String walletNumber, String bankName) { - if (walletNumber == null || walletNumber.length() <= 0) { - walletNumber = getString(R.string.na_text); - } - - if (bankName == null) - bankName = ""; - - tv_wallet_no.setText(walletNumber); - //TODO no bank info present at the moment -// tv_bank_name.setText(bankName); - } - - @Override public void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java index a9381c57..18513faa 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/HomeMenuItemViewHolderV2.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.home.view; +package com.remit.jmecustomer.features.home.view; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java index 84364381..b952c0c7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -9,7 +9,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; @@ -44,7 +44,7 @@ public class ChangePassNotificationView extends NotificaitonBaseView { @Override public void animateNotification() { if(anim==null||!anim.isRunning()) { - anim = ObjectAnimator.ofFloat(kftc_renew_image, View.ROTATION, 0,15,-15,9,-9,0); + anim = ObjectAnimator.ofFloat(kftc_renew_image, ROTATION, 0,15,-15,9,-9,0); anim.setStartDelay(300); anim.setDuration(2000).setRepeatMode(ValueAnimator.RESTART); anim.setRepeatCount(ValueAnimator.INFINITE); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePinNPassNotificationView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePinNPassNotificationView.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePinNPassNotificationView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePinNPassNotificationView.java index 57aa9f6c..f3f585ce 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePinNPassNotificationView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePinNPassNotificationView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -9,7 +9,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; @@ -44,7 +44,7 @@ public class ChangePinNPassNotificationView extends NotificaitonBaseView { @Override public void animateNotification() { if(anim==null||!anim.isRunning()) { - anim = ObjectAnimator.ofFloat(kftc_renew_image, View.ROTATION, 0,15,-15,9,-9,0); + anim = ObjectAnimator.ofFloat(kftc_renew_image, ROTATION, 0,15,-15,9,-9,0); anim.setStartDelay(300); anim.setDuration(2000).setRepeatMode(ValueAnimator.RESTART); anim.setRepeatCount(ValueAnimator.INFINITE); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePinNotificationView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePinNotificationView.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePinNotificationView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePinNotificationView.java index 53d61924..61a2c17c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePinNotificationView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/ChangePinNotificationView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -9,7 +9,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; @@ -44,7 +44,7 @@ public class ChangePinNotificationView extends NotificaitonBaseView { @Override public void animateNotification() { if(anim==null||!anim.isRunning()) { - anim = ObjectAnimator.ofFloat(kftc_renew_image, View.ROTATION, 0,15,-15,9,-9,0); + anim = ObjectAnimator.ofFloat(kftc_renew_image, ROTATION, 0,15,-15,9,-9,0); anim.setStartDelay(300); anim.setDuration(2000).setRepeatMode(ValueAnimator.RESTART); anim.setRepeatCount(ValueAnimator.INFINITE); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/DimBackgroundView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/DimBackgroundView.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/DimBackgroundView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/DimBackgroundView.java index 4c5b7f5f..8b2d8a71 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/DimBackgroundView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/DimBackgroundView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/EmailNotVerifiedView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/EmailNotVerifiedView.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/EmailNotVerifiedView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/EmailNotVerifiedView.java index 45a4ed81..8ee2bb14 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/EmailNotVerifiedView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/EmailNotVerifiedView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -10,7 +10,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java index 0e229760..9e76981a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java @@ -1,9 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.content.Context; import android.view.LayoutInflater; -import com.swifttech.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; +import com.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; +import com.remit.jmecustomer.features.home.presenter.HomeNotificationHandler; public class HomeNotificiationViewFactory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/KYCNotSubmittedNotificationView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/KYCNotSubmittedNotificationView.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/KYCNotSubmittedNotificationView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/KYCNotSubmittedNotificationView.java index 9b122df8..ad548537 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/KYCNotSubmittedNotificationView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/KYCNotSubmittedNotificationView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -9,7 +9,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; @@ -44,7 +44,7 @@ public class KYCNotSubmittedNotificationView extends NotificaitonBaseView { @Override public void animateNotification() { if(anim==null||!anim.isRunning()) { - anim = ObjectAnimator.ofFloat(kftc_renew_image, View.ROTATION, 0,15,-15,9,-9,0); + anim = ObjectAnimator.ofFloat(kftc_renew_image, ROTATION, 0,15,-15,9,-9,0); anim.setStartDelay(300); anim.setDuration(2000).setRepeatMode(ValueAnimator.RESTART); anim.setRepeatCount(ValueAnimator.INFINITE); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/KYCNotVerifiedNotificationView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/KYCNotVerifiedNotificationView.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/KYCNotVerifiedNotificationView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/KYCNotVerifiedNotificationView.java index 1f07a3ad..3d9774af 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/KYCNotVerifiedNotificationView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/KYCNotVerifiedNotificationView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.animation.ObjectAnimator; import android.content.Context; @@ -8,7 +8,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/NotificaitonBaseView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/NotificaitonBaseView.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/NotificaitonBaseView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/NotificaitonBaseView.java index bb1dd448..28d2489c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/NotificaitonBaseView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/NotificaitonBaseView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/TermsNotAcceptedNotificationView.java b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/TermsNotAcceptedNotificationView.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/TermsNotAcceptedNotificationView.java rename to app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/TermsNotAcceptedNotificationView.java index aa80cffb..6de36105 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/TermsNotAcceptedNotificationView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/view/notifications/TermsNotAcceptedNotificationView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.home.view.notifications; +package com.remit.jmecustomer.features.home.view.notifications; import android.animation.ObjectAnimator; import android.content.Context; @@ -8,7 +8,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/gateway/InboundRemitReceiptGateway.java b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/gateway/InboundRemitReceiptGateway.java similarity index 56% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/gateway/InboundRemitReceiptGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/gateway/InboundRemitReceiptGateway.java index 56d06702..82419705 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/gateway/InboundRemitReceiptGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/gateway/InboundRemitReceiptGateway.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.inboundreceipt.gateway; +package com.remit.jmecustomer.features.inboundreceipt.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.inboundreceipt.presenter.InboundRemitReceiptGatewayInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.inboundreceipt.presenter.InboundRemitReceiptGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/model/InboundRemitTxnReceiptDTO.java b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/model/InboundRemitTxnReceiptDTO.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/model/InboundRemitTxnReceiptDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/model/InboundRemitTxnReceiptDTO.java index 569832c8..91abf1ef 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/model/InboundRemitTxnReceiptDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/model/InboundRemitTxnReceiptDTO.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.inboundreceipt.model; +package com.remit.jmecustomer.features.inboundreceipt.model; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java similarity index 67% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java index b89926f4..4059af6c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.inboundreceipt.presenter; +package com.remit.jmecustomer.features.inboundreceipt.presenter; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java rename to app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java index 60d7e235..02b0aa52 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java +++ b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.inboundreceipt.presenter; - -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.inboundreceipt.view.InboundRemitReceiptActivity; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +package com.remit.jmecustomer.features.inboundreceipt.presenter; + +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.inboundreceipt.view.InboundRemitReceiptActivity; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java similarity index 56% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java index 6508b211..404c2de6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.inboundreceipt.presenter; +package com.remit.jmecustomer.features.inboundreceipt.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.inboundreceipt.view.InboundRemitReceiptActivity; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.inboundreceipt.view.InboundRemitReceiptActivity; public interface InboundRemitReceiptPresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java index fdeec3d0..e9561894 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/view/InboundRemitReceiptActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.inboundreceipt.view; +package com.remit.jmecustomer.features.inboundreceipt.view; import android.content.Context; import android.content.Intent; @@ -9,13 +9,13 @@ import android.widget.TextView; import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.features.inboundreceipt.gateway.InboundRemitReceiptGateway; +import com.remit.jmecustomer.features.inboundreceipt.presenter.InboundRemitReceiptPresenterImpl; +import com.remit.jmecustomer.features.inboundreceipt.presenter.InboundRemitReceiptPresenterInterface; +import com.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.inboundreceipt.gateway.InboundRemitReceiptGateway; -import com.swifttech.remit.jmecustomer.features.inboundreceipt.presenter.InboundRemitReceiptPresenterImpl; -import com.swifttech.remit.jmecustomer.features.inboundreceipt.presenter.InboundRemitReceiptPresenterInterface; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/view/ProgressPathView.java b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/view/ProgressPathView.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/view/ProgressPathView.java rename to app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/view/ProgressPathView.java index 5b313d71..b1e057bd 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/inboundreceipt/view/ProgressPathView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/inboundreceipt/view/ProgressPathView.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.inboundreceipt.view; +package com.remit.jmecustomer.features.inboundreceipt.view; import android.content.Context; import android.graphics.Canvas; @@ -11,7 +11,7 @@ import android.view.View; import androidx.annotation.Nullable; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class ProgressPathView extends View { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/ExistingKYCV3ViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/ExistingKYCV3ViewModelFactory.java similarity index 60% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/ExistingKYCV3ViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/ExistingKYCV3ViewModelFactory.java index 6e437994..3c0b56de 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/ExistingKYCV3ViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/ExistingKYCV3ViewModelFactory.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer; +package com.remit.jmecustomer.features.kyc.existingCustomer; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.gateway.ExistingFileDownloadGateway; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.gateway.ExistingExistingKYCV3Gateway; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; +import com.remit.jmecustomer.features.kyc.existingCustomer.gateway.ExistingExistingKYCV3Gateway; +import com.remit.jmecustomer.features.kyc.existingCustomer.gateway.ExistingFileDownloadGateway; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3PresenterInterface; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; public class ExistingKYCV3ViewModelFactory implements ViewModelProvider.Factory { private final ExistingKYCV3PresenterInterface.KYCV3ViewContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingExistingKYCV3Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingExistingKYCV3Gateway.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingExistingKYCV3Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingExistingKYCV3Gateway.java index cc31fa08..600f8726 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingExistingKYCV3Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingExistingKYCV3Gateway.java @@ -1,22 +1,21 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.gateway; +package com.remit.jmecustomer.features.kyc.existingCustomer.gateway; import android.content.Context; import android.content.SharedPreferences; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRelatedDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingNativeCountry; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPersonalInfoDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPicturesDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3GatewayInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3GatewayInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRelatedDataDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRequestDataDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingNativeCountry; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPersonalInfoDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPicturesDTO; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingFileDownloadGateway.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingFileDownloadGateway.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingFileDownloadGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingFileDownloadGateway.java index c60d5f98..67db3883 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingFileDownloadGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/gateway/ExistingFileDownloadGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.gateway; +package com.remit.jmecustomer.features.kyc.existingCustomer.gateway; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTextDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTextDTO.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTextDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTextDTO.java index 9a1131c4..3963122e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTextDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTextDTO.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import android.os.Parcel; import android.os.Parcelable; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.common.customwidgets.banklistingdialog.BankIconMapper; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.banklistingdialog.BankIconMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; public class ExistingIDTextDTO implements Parcelable, GenericImageWithTextListingDialog.ImageWithDataDTOInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTypeDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTypeDTO.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTypeDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTypeDTO.java index 45c1c798..769a0a03 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTypeDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingIDTypeDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTO.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTO.java index 4a6ec918..aa49f25f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTOCopy.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTOCopy.java index 90613d8c..b1135305 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRelatedDataDTOCopy.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; public class ExistingKYCRelatedDataDTOCopy { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRequestDataDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRequestDataDTO.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRequestDataDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRequestDataDTO.java index 598507ef..82d80844 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRequestDataDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingKYCRequestDataDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingNativeCountry.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingNativeCountry.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingNativeCountry.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingNativeCountry.java index a445cf54..46b3486c 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingNativeCountry.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingNativeCountry.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; public class ExistingNativeCountry implements GenericImageWithTextListingDialog.ImageWithDataDTOInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTO.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTO.java index 06b607ef..2a3265a0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTO.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class ExistingPersonalInfoDTO { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTOCopy.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTOCopy.java index 67529e93..969c7ae1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPersonalInfoDTOCopy.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class ExistingPersonalInfoDTOCopy { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTO.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTO.java index ad1f97f7..90ce7ee2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTO.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTOCopy.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTOCopy.java index 4addf4a5..1e54f1db 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPicturesDTOCopy.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import android.util.Log; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTO.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTO.java index a70c538b..688ee032 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTO.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class ExistingPrimaryInformationDTO { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTOCopy.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTOCopy.java index 083b8b7d..6a513390 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/model/ExistingPrimaryInformationDTOCopy.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model; +package com.remit.jmecustomer.features.kyc.existingCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class ExistingPrimaryInformationDTOCopy { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3GatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3GatewayInterface.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3GatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3GatewayInterface.java index ad1ca87d..10f040c1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3GatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3GatewayInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter; +package com.remit.jmecustomer.features.kyc.existingCustomer.presenter; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRelatedDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingNativeCountry; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRelatedDataDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRequestDataDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingNativeCountry; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java index 4582e9fb..87bbad9d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter; - -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeViewLiveData; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.personal.ExistingCustomerDetailViewLiveData; +package com.remit.jmecustomer.features.kyc.existingCustomer.presenter; + +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeViewLiveData; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.personal.ExistingCustomerDetailViewLiveData; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java index 4b57b9bb..1a686241 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java @@ -1,33 +1,34 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter; +package com.remit.jmecustomer.features.kyc.existingCustomer.presenter; import android.annotation.SuppressLint; +import android.text.TextUtils; import android.util.Log; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.gateway.ExistingFileDownloadGateway; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRelatedDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPersonalInfoDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPicturesDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeFragment; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeViewLiveData; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.personal.ExistingCustomerDetailViewLiveData; -import com.swifttech.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.ImageUtils; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; +import com.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.existingCustomer.gateway.ExistingFileDownloadGateway; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRelatedDataDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingKYCRequestDataDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPersonalInfoDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPicturesDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeFragment; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeViewLiveData; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.personal.ExistingCustomerDetailViewLiveData; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.ImageUtils; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.io.File; import java.lang.reflect.Type; @@ -43,7 +44,6 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.PublishSubject; import static android.app.Activity.RESULT_OK; -import static com.swifttech.remit.jmecustomer.utils.Constants.FINGER_PRINT; public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYCV3PresenterInterface { @@ -470,17 +470,26 @@ public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYC public boolean validateAllDetailForm() { ExistingKYCRelatedDataDTO existingKYCRelatedDataDTO = validator.getExistingKycRelatedDataDTO(); ExistingIDTextDTO visaStatus = existingKYCRelatedDataDTO.getVisaStatusFromId(existingKYCRelatedDataDTO.getPersonalInformation().getVisaStatus()); - ExistingIDTextDTO occupation = existingKYCRelatedDataDTO.getOccupationFromId(existingKYCRelatedDataDTO.getPersonalInformation().getOccupation()); + ExistingIDTextDTO occupation=null; + if( !TextUtils.isEmpty(existingKYCRelatedDataDTO.getPersonalInformation().getOccupation())){ + occupation=existingKYCRelatedDataDTO.getOccupationFromId(existingKYCRelatedDataDTO.getPersonalInformation().getOccupation()); + }else if(!TextUtils.isEmpty(existingKYCRelatedDataDTO.getPersonalInformation().getOtherOccupation())){ + occupation=ExistingIDTextDTO.createFromUserAnswerInput(existingKYCRelatedDataDTO.getPersonalInformation().getOtherOccupation()); + } ExistingIDTextDTO purposeOfRegistration = existingKYCRelatedDataDTO.getPurposeOfRegistrationFromId(existingKYCRelatedDataDTO.getPersonalInformation().getPurposeOfRegistration()); CharSequence address = existingKYCRelatedDataDTO.getPersonalInformation().getAdditionalAddress(); ExistingIDTextDTO businessType = existingKYCRelatedDataDTO.getBusinessTypeFromId(existingKYCRelatedDataDTO.getPersonalInformation().getBusinessType()); - ExistingIDTextDTO selectedIdType = existingKYCRelatedDataDTO.getIDTypeFromId(existingKYCRelatedDataDTO.getPersonalInformation().getIdType()); + ExistingIDTextDTO selectedIdType=null; + if( !TextUtils.isEmpty(existingKYCRelatedDataDTO.getPersonalInformation().getIdType())){ + selectedIdType=existingKYCRelatedDataDTO.getIDTypeFromId(existingKYCRelatedDataDTO.getPersonalInformation().getIdType()); + }else if(!TextUtils.isEmpty(existingKYCRelatedDataDTO.getPersonalInformation().getOtherIdType())){ + selectedIdType=ExistingIDTextDTO.createFromUserAnswerInput(existingKYCRelatedDataDTO.getPersonalInformation().getOtherIdType()); + } CharSequence mobileNumber = existingKYCRelatedDataDTO.getPersonalInformation().getMobile(); CharSequence monthlyIncome = existingKYCRelatedDataDTO.getPersonalInformation().getMonthlyIncome(); CharSequence employerName = existingKYCRelatedDataDTO.getPersonalInformation().getEmployeerName(); - if ( - validator.validateEmployerName(employerName) && + if (validator.validateEmployerName(employerName) && validator.validateOccupation(occupation) && validator.validateMonthlyIncome(monthlyIncome) && validator.validateMobileNumber(mobileNumber) && diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java index 66e86282..18d78b57 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view; +package com.remit.jmecustomer.features.kyc.existingCustomer.view; import android.app.Activity; import android.content.Intent; @@ -14,19 +14,19 @@ import androidx.lifecycle.ViewModelProvider; import androidx.transition.TransitionManager; import androidx.viewpager.widget.ViewPager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.ExistingKYCV3ViewModelFactory; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeFragment; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.personal.ExistingCustomerDetailFragment; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.termsAndConditions.ExistingKycTermsAndConditionFragment; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3PresenterInterface; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.documents.ExistingKYCIDTypeFragment; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.personal.ExistingCustomerDetailFragment; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.termsAndConditions.ExistingKycTermsAndConditionFragment; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.existingCustomer.ExistingKYCV3ViewModelFactory; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java new file mode 100644 index 00000000..8c53228d --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java @@ -0,0 +1,11 @@ +package com.remit.jmecustomer.features.kyc.existingCustomer.view.documents; + +import com.remit.jmecustomer.base.BaseFragment; + +public class ExistingKYCAdditionalIDTypeFragment extends BaseFragment { + + + + + +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeViewLiveData.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeViewLiveData.java index f07402ee..dfd00134 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeViewLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents; +package com.remit.jmecustomer.features.kyc.existingCustomer.view.documents; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java index 413bb17d..e3a5e79d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java @@ -1,10 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents; +package com.remit.jmecustomer.features.kyc.existingCustomer.view.documents; import android.Manifest; import android.annotation.SuppressLint; import android.content.ClipData; import android.content.Intent; -import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.net.Uri; @@ -33,14 +32,14 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; import com.google.firebase.installations.FirebaseInstallations; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; -import com.swifttech.remit.jmecustomer.utils.other.Utility; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.utils.other.Utility; import com.theartofdev.edmodo.cropper.CropImage; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeViewLiveData.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeViewLiveData.java index 0a47696d..a2203c17 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeViewLiveData.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents; +package com.remit.jmecustomer.features.kyc.existingCustomer.view.documents; import android.graphics.Bitmap; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java index d9d96c6a..c7224d74 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.personal; +package com.remit.jmecustomer.features.kyc.existingCustomer.view.personal; import android.annotation.SuppressLint; import android.graphics.Rect; @@ -17,15 +17,15 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.view.MTextInputLayout; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; -import com.swifttech.remit.jmecustomer.utils.RxUtils; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3PresenterInterface; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.view.MTextInputLayout; +import com.remit.jmecustomer.utils.RxUtils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailViewLiveData.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailViewLiveData.java index 7ba2f7ea..b6114158 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/personal/ExistingCustomerDetailViewLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.personal; +package com.remit.jmecustomer.features.kyc.existingCustomer.view.personal; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingIDTextDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java index 39bc626e..d2719b23 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/termsAndConditions/ExistingKycTermsAndConditionFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.termsAndConditions; +package com.remit.jmecustomer.features.kyc.existingCustomer.view.termsAndConditions; import android.os.Bundle; import android.util.Log; @@ -8,11 +8,11 @@ import android.webkit.WebView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.kyc.existingCustomer.presenter.ExistingKYCV3ViewModel; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_REGISTER_TERMS; +import static com.remit.jmecustomer.utils.Constants.JME_REGISTER_TERMS; public class ExistingKycTermsAndConditionFragment extends WebBrowserFragmentV2 { private ExistingKYCV3ViewModel kycv3ViewModel; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/KYCV3ViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/KYCV3ViewModelFactory.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/KYCV3ViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/KYCV3ViewModelFactory.java index ab05695f..252d2972 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/KYCV3ViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/KYCV3ViewModelFactory.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer; +package com.remit.jmecustomer.features.kyc.newCustomer; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.gateway.FileDownloadGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.gateway.KYCV3Gateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; +import com.remit.jmecustomer.features.kyc.newCustomer.gateway.FileDownloadGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.gateway.KYCV3Gateway; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; public class KYCV3ViewModelFactory implements ViewModelProvider.Factory { private final KYCV3PresenterInterface.KYCV3ViewContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/gateway/FileDownloadGateway.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/FileDownloadGateway.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/gateway/FileDownloadGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/FileDownloadGateway.java index 9194dc5a..2dc98e87 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/gateway/FileDownloadGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/FileDownloadGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.gateway; +package com.remit.jmecustomer.features.kyc.newCustomer.gateway; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java index 1bcf4c3b..f488c762 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/gateway/KYCV3Gateway.java @@ -1,22 +1,22 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.gateway; +package com.remit.jmecustomer.features.kyc.newCustomer.gateway; import android.content.Context; import android.content.SharedPreferences; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.KYCRelatedDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.KYCRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.PersonalInfoDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.PicturesDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3GatewayInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3GatewayInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.KYCRelatedDataDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.KYCRequestDataDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.kyc.newCustomer.model.PersonalInfoDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.PicturesDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/IDTextDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/IDTextDTO.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/IDTextDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/IDTextDTO.java index 40953535..1c834f52 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/IDTextDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/IDTextDTO.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import android.os.Parcel; import android.os.Parcelable; -import com.swifttech.remit.jmecustomer.common.customwidgets.banklistingdialog.BankIconMapper; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.banklistingdialog.BankIconMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/IDTypeDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/IDTypeDTO.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/IDTypeDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/IDTypeDTO.java index 3104b9bc..089524ff 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/IDTypeDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/IDTypeDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTO.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTO.java index 3f9a4eb4..c3b5b7e6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTOCopy.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTOCopy.java index 3b2e86ba..b9a4481c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRelatedDataDTOCopy.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; public class KYCRelatedDataDTOCopy { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRequestDataDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRequestDataDTO.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRequestDataDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRequestDataDTO.java index f17c6d52..5a53ce59 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/KYCRequestDataDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/KYCRequestDataDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java index e3ab8c92..59035dca 100755 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/NativeCountry.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTO.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTO.java index 265ca56a..07947bad 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTO.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTOCopy.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTOCopy.java index e16fb9c4..a8457aaf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PersonalInfoDTOCopy.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class PersonalInfoDTOCopy { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTO.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTO.java index 7a9309ab..f3e5b339 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTO.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTOCopy.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTOCopy.java index e720fccf..0bdaca40 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PicturesDTOCopy.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import android.util.Log; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTO.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTO.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTO.java index c0f0d6a5..4899d0fc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTO.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTOCopy.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTOCopy.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTOCopy.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTOCopy.java index 284c0ca3..643f8d52 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTOCopy.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/model/PrimaryInformationDTOCopy.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model; +package com.remit.jmecustomer.features.kyc.newCustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class PrimaryInformationDTOCopy { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3GatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3GatewayInterface.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3GatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3GatewayInterface.java index ae7434a1..6f83fef6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3GatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3GatewayInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter; +package com.remit.jmecustomer.features.kyc.newCustomer.presenter; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.KYCRelatedDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.KYCRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.KYCRelatedDataDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.KYCRequestDataDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java similarity index 77% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java index 8d3df9da..9060e543 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3PresenterInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter; - -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeViewLiveData; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailViewLiveData; +package com.remit.jmecustomer.features.kyc.newCustomer.presenter; + +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeViewLiveData; +import com.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailViewLiveData; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java index 5b48cedd..54593cea 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java @@ -1,33 +1,34 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter; +package com.remit.jmecustomer.features.kyc.newCustomer.presenter; import android.annotation.SuppressLint; +import android.text.TextUtils; import android.util.Log; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.gateway.FileDownloadGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.KYCRelatedDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.KYCRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.PersonalInfoDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.PicturesDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeFragment; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeViewLiveData; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailViewLiveData; -import com.swifttech.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.ImageUtils; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; +import com.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.newCustomer.gateway.FileDownloadGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.KYCRelatedDataDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.KYCRequestDataDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.PersonalInfoDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.PicturesDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeFragment; +import com.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeViewLiveData; +import com.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailViewLiveData; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.ImageUtils; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.io.File; import java.lang.reflect.Type; @@ -120,11 +121,21 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter public boolean validateAllDetailForm() { KYCRelatedDataDTO kycRelatedDataDTO = validator.getKycRelatedDataDTO(); IDTextDTO additionalIdType = kycRelatedDataDTO.getAdditionalIdTypeFromId(kycRelatedDataDTO.getPersonalInformation().getAdditionalIdType()); - IDTextDTO occupation = kycRelatedDataDTO.getOccupationFromId(kycRelatedDataDTO.getPersonalInformation().getOccupation()); + IDTextDTO occupation=null; + if( !TextUtils.isEmpty(kycRelatedDataDTO.getPersonalInformation().getOccupation())){ + occupation=kycRelatedDataDTO.getOccupationFromId(kycRelatedDataDTO.getPersonalInformation().getOccupation()); + }else if(!TextUtils.isEmpty(kycRelatedDataDTO.getPersonalInformation().getOtherOccupation())){ + occupation=IDTextDTO.createFromUserAnswerInput(kycRelatedDataDTO.getPersonalInformation().getOtherOccupation()); + } IDTextDTO purposeOfRegistration = kycRelatedDataDTO.getPurposeOfRegistrationFromId(kycRelatedDataDTO.getPersonalInformation().getPurposeOfRegistration()); CharSequence address = kycRelatedDataDTO.getPersonalInformation().getAdditionalAddress(); IDTextDTO businessType = kycRelatedDataDTO.getBusinessTypeFromId(kycRelatedDataDTO.getPersonalInformation().getBusinessType()); - IDTextDTO selectedIdType = kycRelatedDataDTO.getIDTypeFromId(kycRelatedDataDTO.getPersonalInformation().getIdType()); + IDTextDTO selectedIdType=null; + if( !TextUtils.isEmpty(kycRelatedDataDTO.getPersonalInformation().getIdType())){ + selectedIdType=kycRelatedDataDTO.getIDTypeFromId(kycRelatedDataDTO.getPersonalInformation().getIdType()); + }else if(!TextUtils.isEmpty(kycRelatedDataDTO.getPersonalInformation().getOtherIdType())){ + selectedIdType=IDTextDTO.createFromUserAnswerInput(kycRelatedDataDTO.getPersonalInformation().getOtherIdType()); + } CharSequence mobileNumber = kycRelatedDataDTO.getPersonalInformation().getMobile(); CharSequence monthlyIncome = kycRelatedDataDTO.getPersonalInformation().getMonthlyIncome(); CharSequence employerName = kycRelatedDataDTO.getPersonalInformation().getEmployeerName(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/KYCV3Activity.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/KYCV3Activity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/KYCV3Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/KYCV3Activity.java index e272bc5d..1eab8ca0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/KYCV3Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/KYCV3Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view; +package com.remit.jmecustomer.features.kyc.newCustomer.view; import android.app.Activity; import android.content.Intent; @@ -15,20 +15,20 @@ import androidx.lifecycle.ViewModelProvider; import androidx.transition.TransitionManager; import androidx.viewpager.widget.ViewPager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.KYCV3ViewModelFactory; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeFragment; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailFragment; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition.NewKycTermsAndConditionFragment; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; +import com.remit.jmecustomer.features.kyc.newCustomer.view.documents.KYCIDTypeFragment; +import com.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailFragment; +import com.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition.NewKycTermsAndConditionFragment; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.newCustomer.KYCV3ViewModelFactory; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java index c7627fdd..0e985400 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.documents; +package com.remit.jmecustomer.features.kyc.newCustomer.view.documents; import android.Manifest; import android.annotation.SuppressLint; @@ -31,14 +31,14 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.view.OnFragmentSelectedListener; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; -import com.swifttech.remit.jmecustomer.utils.other.Utility; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.view.OnFragmentSelectedListener; +import com.remit.jmecustomer.utils.other.Utility; import com.theartofdev.edmodo.cropper.CropImage; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeViewLiveData.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeViewLiveData.java index 9a8529a6..7a5ad97a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeViewLiveData.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.documents; +package com.remit.jmecustomer.features.kyc.newCustomer.view.documents; import android.graphics.Bitmap; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java index facbcd3f..7970803d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java @@ -1,8 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.personal; +package com.remit.jmecustomer.features.kyc.newCustomer.view.personal; import android.annotation.SuppressLint; -import android.content.SharedPreferences; -import android.content.res.Resources; import android.graphics.Rect; import android.os.Bundle; import android.util.Log; @@ -20,17 +18,17 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputLayout; import com.google.firebase.installations.FirebaseInstallations; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.view.OnFragmentSelectedListener; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; -import com.swifttech.remit.jmecustomer.utils.RxUtils; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.view.OnFragmentSelectedListener; +import com.remit.jmecustomer.utils.RxUtils; import butterknife.BindView; import butterknife.ButterKnife; @@ -142,7 +140,6 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - Log.d("===>", "CustomerDetailFragment onCreateView called"); return inflater.inflate(R.layout.fragment_kyc_customer_detail, container, false); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailViewLiveData.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailViewLiveData.java index 3429bb3c..29858f4e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailViewLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.personal; +package com.remit.jmecustomer.features.kyc.newCustomer.view.personal; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java index d404e941..3edefce9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/termsAndCondition/NewKycTermsAndConditionFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition; +package com.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition; import android.os.Bundle; import android.util.Log; @@ -8,11 +8,11 @@ import android.webkit.WebView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_REGISTER_TERMS; +import static com.remit.jmecustomer.utils.Constants.JME_REGISTER_TERMS; public class NewKycTermsAndConditionFragment extends WebBrowserFragmentV2 { private KYCV3ViewModel kycv3ViewModel; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/LoginViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/login/LoginViewModelFactory.java similarity index 66% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/LoginViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/login/LoginViewModelFactory.java index 542b7699..e4ac3741 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/LoginViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/LoginViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.login; +package com.remit.jmecustomer.features.login; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2ViewModel; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2PresenterInterface; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; +import com.remit.jmecustomer.features.login.presenter.LoginV2PresenterInterface; +import com.remit.jmecustomer.features.login.presenter.LoginV2ViewModel; public class LoginViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/gateway/LoginV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/login/gateway/LoginV2Gateway.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/gateway/LoginV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/login/gateway/LoginV2Gateway.java index edd0bf02..0def58b9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/gateway/LoginV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/gateway/LoginV2Gateway.java @@ -1,16 +1,16 @@ -package com.swifttech.remit.jmecustomer.features.login.gateway; +package com.remit.jmecustomer.features.login.gateway; import android.annotation.SuppressLint; import android.content.SharedPreferences; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.login.model.LoginModelV2; -import com.swifttech.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.login.model.LoginModelV2; +import com.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/model/LoginModelV2.java b/app/src/main/java/com/remit/jmecustomer/features/login/model/LoginModelV2.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/model/LoginModelV2.java rename to app/src/main/java/com/remit/jmecustomer/features/login/model/LoginModelV2.java index 70491562..0ce9f4af 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/model/LoginModelV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/model/LoginModelV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.login.model; +package com.remit.jmecustomer.features.login.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/model/LoginV2DataApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/login/model/LoginV2DataApiResponse.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/model/LoginV2DataApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/login/model/LoginV2DataApiResponse.java index 4d97e587..3bc3e7ed 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/model/LoginV2DataApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/model/LoginV2DataApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.login.model; +package com.remit.jmecustomer.features.login.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2InteractorInterface.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2InteractorInterface.java index 4d431148..fdeab7c1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2InteractorInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.login.presenter; +package com.remit.jmecustomer.features.login.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.login.model.LoginModelV2; -import com.swifttech.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.login.model.LoginModelV2; +import com.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2PresenterInterface.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2PresenterInterface.java index 20aa8f9e..035766d1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2PresenterInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.login.presenter; +package com.remit.jmecustomer.features.login.presenter; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; public interface LoginV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java index 2b7f363d..2bbfcbce 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java @@ -1,20 +1,20 @@ -package com.swifttech.remit.jmecustomer.features.login.presenter; +package com.remit.jmecustomer.features.login.presenter; import androidx.appcompat.app.AppCompatActivity; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.login.model.LoginModelV2; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; +import com.remit.jmecustomer.features.login.model.LoginModelV2; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -22,7 +22,7 @@ import io.reactivex.disposables.CompositeDisposable; import io.reactivex.observers.DisposableObserver; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.Constants.FINGER_PRINT; +import static com.remit.jmecustomer.utils.Constants.FINGER_PRINT; public class LoginV2ViewModel extends BaseViewModel implements LoginV2PresenterInterface, LoginV2InteractorInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginViewLiveData.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginViewLiveData.java index e80211df..be14d0ff 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/presenter/LoginViewLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.login.presenter; +package com.remit.jmecustomer.features.login.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/view/LoginV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/login/view/LoginV2Activity.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/login/view/LoginV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/login/view/LoginV2Activity.java index c5ed2461..a16f201a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/view/LoginV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/login/view/LoginV2Activity.java @@ -1,10 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.login.view; +package com.remit.jmecustomer.features.login.view; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.provider.Settings; +import android.text.Editable; +import android.text.TextWatcher; import android.util.Log; import android.view.View; import android.widget.Button; @@ -16,7 +17,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatDelegate; -import androidx.biometric.BiometricManager; import androidx.biometric.BiometricPrompt; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; @@ -26,36 +26,34 @@ import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.google.firebase.messaging.FirebaseMessaging; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.login.LoginViewModelFactory; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2ViewModel; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginViewLiveData; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.view.NewRegisterV2Activity; -import com.swifttech.remit.jmecustomer.features.resetpassword.view.ResetPassV2Activity; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager1; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; - -import java.nio.charset.StandardCharsets; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; +import com.remit.jmecustomer.features.login.presenter.LoginV2PresenterInterface; +import com.remit.jmecustomer.features.login.presenter.LoginV2ViewModel; +import com.remit.jmecustomer.features.login.presenter.LoginViewLiveData; +import com.remit.jmecustomer.features.registerv2.newcustomer.view.NewRegisterV2Activity; +import com.remit.jmecustomer.features.resetpassword.view.ResetPassV2Activity; +import com.remit.jmecustomer.features.security.RemitAuthManager1; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.login.LoginViewModelFactory; + import java.util.concurrent.Executor; import butterknife.BindView; import butterknife.ButterKnife; -import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG; -import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK; -import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_HW_UNAVAILABLE; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NO_HARDWARE; -import static com.swifttech.remit.jmecustomer.utils.Constants.LOGIN; +import static com.remit.jmecustomer.base.PrefKeys.PREF_LOGIN_CREDENTIALS_DATA_ENCRYPTED; +import static com.remit.jmecustomer.base.PrefKeys.PREF_LOGIN_CREDENTIALS_INITIALIZATION_VECTOR; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_HW_UNAVAILABLE; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NO_HARDWARE; +import static com.remit.jmecustomer.utils.Constants.LOGIN; public class LoginV2Activity extends BaseActivity implements View.OnClickListener, LoginV2PresenterInterface.LoginV2ContractInterface, RemitAuthManager1.RemitAuthListener1 { @@ -191,7 +189,22 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene RxTextView.textChanges(usernameId).skipInitialValue(), RxTextView.textChanges(passwordEdTxt).skipInitialValue() )); + usernameId.addTextChangedListener(new TextWatcher() { + + @Override + public void afterTextChanged(Editable s) {} + + @Override + public void beforeTextChanged(CharSequence s, int start, + int count, int after) { + } + + @Override + public void onTextChanged(CharSequence s, int start, + int before, int count) { + } + }); loginRelatedViewEvents.getUserIdInputLiveData().observe(this, this::onUserIdDataReceived); loginRelatedViewEvents.getPasswordInputLiveData().observe(this, this::onPasswordDataReceived); loginRelatedViewEvents.getAllFormValidLiveData().observe(this, result -> { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/NoticeViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/notice/NoticeViewModelFactory.java similarity index 66% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/NoticeViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/NoticeViewModelFactory.java index e6fecaf8..a16fbe5f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/NoticeViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/NoticeViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.notice; +package com.remit.jmecustomer.features.notice; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.notice.gateway.NoticeGateway; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticePresenterInterface; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticeViewModel; +import com.remit.jmecustomer.features.notice.gateway.NoticeGateway; +import com.remit.jmecustomer.features.notice.presenter.NoticePresenterInterface; +import com.remit.jmecustomer.features.notice.presenter.NoticeViewModel; public class NoticeViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java index 8232a803..e92d4950 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.notice.adapter; +package com.remit.jmecustomer.features.notice.adapter; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -6,8 +6,8 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDTO; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.notice.model.NoticeDTO; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVViewholder.java b/app/src/main/java/com/remit/jmecustomer/features/notice/adapter/NoticeListingRVViewholder.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVViewholder.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/adapter/NoticeListingRVViewholder.java index e59b18e4..947bc1c1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVViewholder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/adapter/NoticeListingRVViewholder.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.notice.adapter; +package com.remit.jmecustomer.features.notice.adapter; import android.view.View; import android.widget.ImageView; @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java b/app/src/main/java/com/remit/jmecustomer/features/notice/gateway/NoticeGateway.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/gateway/NoticeGateway.java index b3147e2f..36185540 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/gateway/NoticeGateway.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.notice.gateway; +package com.remit.jmecustomer.features.notice.gateway; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDTO; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDetailDTO; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticeGatewayInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.notice.presenter.NoticeGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.notice.model.NoticeDTO; +import com.remit.jmecustomer.features.notice.model.NoticeDetailDTO; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/model/NoticeDTO.java b/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDTO.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/model/NoticeDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDTO.java index 7a6c7127..aca25a02 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/model/NoticeDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.notice.model; +package com.remit.jmecustomer.features.notice.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/model/NoticeDetailDTO.java b/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDetailDTO.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/model/NoticeDetailDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDetailDTO.java index cebb793a..0ae22f68 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/model/NoticeDetailDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDetailDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.notice.model; +package com.remit.jmecustomer.features.notice.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticeGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticeGatewayInterface.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticeGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticeGatewayInterface.java index 4270c6f4..d72ff9f0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticeGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticeGatewayInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.notice.presenter; +package com.remit.jmecustomer.features.notice.presenter; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDTO; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDetailDTO; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.notice.model.NoticeDTO; +import com.remit.jmecustomer.features.notice.model.NoticeDetailDTO; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticePresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticePresenterInterface.java similarity index 69% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticePresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticePresenterInterface.java index 1e5b81a8..ae00fe1e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticePresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticePresenterInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.notice.presenter; +package com.remit.jmecustomer.features.notice.presenter; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDTO; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDetailDTO; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.notice.model.NoticeDTO; +import com.remit.jmecustomer.features.notice.model.NoticeDetailDTO; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticeViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticeViewModel.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticeViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticeViewModel.java index 6ef33679..98d758a1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/presenter/NoticeViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/presenter/NoticeViewModel.java @@ -1,18 +1,18 @@ -package com.swifttech.remit.jmecustomer.features.notice.presenter; +package com.remit.jmecustomer.features.notice.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDTO; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDetailDTO; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.notice.model.NoticeDTO; +import com.remit.jmecustomer.features.notice.model.NoticeDetailDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; import java.util.Collections; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeActivity.java b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeActivity.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeActivity.java index e436762f..9e389718 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.notice.view; +package com.remit.jmecustomer.features.notice.view; import android.content.Intent; import android.os.Bundle; @@ -8,13 +8,13 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.viewpager.widget.ViewPager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.notice.NoticeViewModelFactory; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticePresenterInterface; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticeViewModel; +import com.remit.jmecustomer.features.notice.presenter.NoticePresenterInterface; +import com.remit.jmecustomer.features.notice.presenter.NoticeViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.notice.NoticeViewModelFactory; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeDetailFragment.java b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeDetailFragment.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeDetailFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeDetailFragment.java index 1ce94ba5..bced3574 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeDetailFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeDetailFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.notice.view; +package com.remit.jmecustomer.features.notice.view; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; @@ -17,10 +17,10 @@ import androidx.lifecycle.ViewModelProvider; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDetailDTO; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticeViewModel; +import com.remit.jmecustomer.features.notice.model.NoticeDetailDTO; +import com.remit.jmecustomer.features.notice.presenter.NoticeViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeListingFragment.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeListingFragment.java index 3fbac210..843c777d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeListingFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.notice.view; +package com.remit.jmecustomer.features.notice.view; import android.content.Intent; import android.os.Bundle; @@ -10,14 +10,13 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.notice.adapter.NoticeListingRVAdapter; -import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDTO; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticePresenterInterface; -import com.swifttech.remit.jmecustomer.features.notice.presenter.NoticeViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2TransactionCompleteActivity; +import com.remit.jmecustomer.features.notice.adapter.NoticeListingRVAdapter; +import com.remit.jmecustomer.features.notice.model.NoticeDTO; +import com.remit.jmecustomer.features.notice.presenter.NoticePresenterInterface; +import com.remit.jmecustomer.features.notice.presenter.NoticeViewModel; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2TransactionCompleteActivity; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/OTPVerificationViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/OTPVerificationViewModelFactory.java similarity index 63% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/OTPVerificationViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/OTPVerificationViewModelFactory.java index 79254663..f4cb2bf1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/OTPVerificationViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/OTPVerificationViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.otpverification; +package com.remit.jmecustomer.features.otpverification; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.otpverification.gateway.OTPVerificationGateway; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenterInterface; +import com.remit.jmecustomer.features.otpverification.gateway.OTPVerificationGateway; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenterInterface; public class OTPVerificationViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/gateway/OTPVerificationGateway.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/gateway/OTPVerificationGateway.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/gateway/OTPVerificationGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/gateway/OTPVerificationGateway.java index 9a0d4143..2271366c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/gateway/OTPVerificationGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/gateway/OTPVerificationGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.gateway; +package com.remit.jmecustomer.features.otpverification.gateway; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationGatewayInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/model/OTPSubmitModelDTO.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/model/OTPSubmitModelDTO.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/model/OTPSubmitModelDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/model/OTPSubmitModelDTO.java index 4cc419d7..c8d9f900 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/model/OTPSubmitModelDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/model/OTPSubmitModelDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.model; +package com.remit.jmecustomer.features.otpverification.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationGatewayInterface.java similarity index 69% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationGatewayInterface.java index 04e0c05d..599d6845 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.presenter; +package com.remit.jmecustomer.features.otpverification.presenter; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenter.java index 7bc52ab6..5f878299 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenter.java @@ -1,16 +1,16 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.presenter; +package com.remit.jmecustomer.features.otpverification.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.otpverification.model.OTPSubmitModelDTO; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.otpverification.model.OTPSubmitModelDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenterInterface.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenterInterface.java index 99a3b662..82a01fe4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/presenter/OTPVerificationPresenterInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.presenter; +package com.remit.jmecustomer.features.otpverification.presenter; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BaseContractInterface; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPRequestFragment.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPRequestFragment.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPRequestFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPRequestFragment.java index e9fdd6ec..1780ef49 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPRequestFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPRequestFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.view; +package com.remit.jmecustomer.features.otpverification.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -11,9 +11,9 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPVerificationActivity.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPVerificationActivity.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPVerificationActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPVerificationActivity.java index 7974d135..a5b5632a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPVerificationActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPVerificationActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.view; +package com.remit.jmecustomer.features.otpverification.view; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -8,13 +8,13 @@ import android.os.Bundle; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.features.otpverification.OTPVerificationViewModelFactory; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenterInterface; -import com.swifttech.remit.jmecustomer.features.register.view.RegisterV2Activity; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.features.otpverification.OTPVerificationViewModelFactory; +import com.remit.jmecustomer.features.register.view.RegisterV2Activity; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPVerifyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPVerifyFragment.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPVerifyFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPVerifyFragment.java index 3c5269d4..62ad1a4f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/otpverification/view/OTPVerifyFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/otpverification/view/OTPVerifyFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.otpverification.view; +package com.remit.jmecustomer.features.otpverification.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -11,10 +11,10 @@ import androidx.lifecycle.ViewModelProvider; import com.jakewharton.rxbinding3.widget.RxTextView; import com.mukesh.OtpView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; -import com.swifttech.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenterInterface; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenter; +import com.remit.jmecustomer.features.otpverification.presenter.OTPVerificationPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/RecipientAddViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/RecipientAddViewModelFactory.java similarity index 52% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/RecipientAddViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/RecipientAddViewModelFactory.java index a6ee5600..e030549c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/RecipientAddViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/RecipientAddViewModelFactory.java @@ -1,17 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGateway; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add.RecipientAddViewModel; +import com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGateway; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add.RecipientAddViewModel; public class RecipientAddViewModelFactory implements ViewModelProvider.Factory { - private RecipientAddContractInterface view; - private ReceiverInfoModel receiverInfoModel; + private RecipientAddContractInterface view; + private ReceiverInfoModel receiverInfoModel; public RecipientAddViewModelFactory( diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/RecipientEditViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/RecipientEditViewModelFactory.java similarity index 59% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/RecipientEditViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/RecipientEditViewModelFactory.java index 97e7ed28..2843b638 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/RecipientEditViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/RecipientEditViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGateway; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit.RecipientEditViewModel; +import com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGateway; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit.RecipientEditViewModel; public class RecipientEditViewModelFactory implements ViewModelProvider.Factory { private final RecipientAddContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/adapter/RecipientListingRvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/adapter/RecipientListingRvAdapter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/adapter/RecipientListingRvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/adapter/RecipientListingRvAdapter.java index 9dfc1a0a..46f25ad8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/adapter/RecipientListingRvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/adapter/RecipientListingRvAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.adapter; +package com.remit.jmecustomer.features.recipientlisting.adapter; import android.view.LayoutInflater; import android.view.View; @@ -7,10 +7,10 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientlisting.RecipientListViewholder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.view.recipientlisting.RecipientListViewholder; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGateway.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGateway.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGateway.java index b26698b4..da1e06af 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGateway.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit; import android.content.Context; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGatewayInterface.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGatewayInterface.java index f0afaa3a..6144200d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientaddedit/RecipientAddEditGatewayInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientlisting/RecipientListingGateway.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientlisting/RecipientListingGateway.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientlisting/RecipientListingGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientlisting/RecipientListingGateway.java index 1787011a..a7854d59 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/gateway/recipientlisting/RecipientListingGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/gateway/recipientlisting/RecipientListingGateway.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.gateway.recipientlisting; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting.RecipientListingInteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting.RecipientListingInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/CountryServiceModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/CountryServiceModel.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/CountryServiceModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/CountryServiceModel.java index 901d5baa..62ce83f2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/CountryServiceModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/CountryServiceModel.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice; +package com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/ServiceTypeModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/ServiceTypeModel.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/ServiceTypeModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/ServiceTypeModel.java index 0956225d..1c3b9720 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/ServiceTypeModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/countryservice/ServiceTypeModel.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice; +package com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.features.exrate.model.PaymentModeMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.features.exrate.model.PaymentModeMapper; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DropDownDTO.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DropDownDTO.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DropDownDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DropDownDTO.java index 75afb648..5fd01fbb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DropDownDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DropDownDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; +package com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DynamicValidationModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DynamicValidationModel.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DynamicValidationModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DynamicValidationModel.java index bfbb7526..a3fc32ce 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DynamicValidationModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/DynamicValidationModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; +package com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PaymentBankModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PaymentBankModel.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PaymentBankModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PaymentBankModel.java index 921805d3..2de131ed 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PaymentBankModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PaymentBankModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; +package com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PayoutProvincesModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PayoutProvincesModel.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PayoutProvincesModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PayoutProvincesModel.java index 83521ff9..73c86990 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PayoutProvincesModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/PayoutProvincesModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; +package com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java index 1d71831a..9bfa9fc1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientaddedit/dynamicvalidation/ValidationRuleModel.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; +package com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation; import android.util.Log; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; public class ValidationRuleModel { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/AgentModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/AgentModel.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/AgentModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/AgentModel.java index bee0e44f..2d634afa 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/AgentModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/AgentModel.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.model.recipientlisting; import android.os.Parcel; import android.os.Parcelable; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class AgentModel implements Parcelable { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/BranchModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/BranchModel.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/BranchModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/BranchModel.java index 502bd55a..1f3f262c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/BranchModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/BranchModel.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.model.recipientlisting; import android.os.Parcel; import android.os.Parcelable; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; public class BranchModel implements Parcelable { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/PaymentMethodModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/PaymentMethodModel.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/PaymentMethodModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/PaymentMethodModel.java index 68c99db1..462edc54 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/PaymentMethodModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/PaymentMethodModel.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.model.recipientlisting; import android.os.Parcel; import android.os.Parcelable; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/ReceiverInfoModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/ReceiverInfoModel.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/ReceiverInfoModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/ReceiverInfoModel.java index c2c7f2c4..f3f053ed 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/ReceiverInfoModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/ReceiverInfoModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.model.recipientlisting; import android.os.Parcel; import android.os.Parcelable; @@ -6,12 +6,12 @@ import android.util.Log; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.utils.Utils; public class ReceiverInfoModel implements Parcelable { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/RecipientRelatedDataModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/RecipientRelatedDataModel.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/RecipientRelatedDataModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/RecipientRelatedDataModel.java index d7854f4c..9eced5be 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/RecipientRelatedDataModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/RecipientRelatedDataModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.model.recipientlisting; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/SendMoneyRequiredData.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/SendMoneyRequiredData.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/SendMoneyRequiredData.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/SendMoneyRequiredData.java index c6349e14..7e102b5e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/model/recipientlisting/SendMoneyRequiredData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/model/recipientlisting/SendMoneyRequiredData.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.model.recipientlisting; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/RecipientDetailValidatorFieldMapping.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/RecipientDetailValidatorFieldMapping.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/RecipientDetailValidatorFieldMapping.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/RecipientDetailValidatorFieldMapping.java index e1f65148..ad6814a8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/RecipientDetailValidatorFieldMapping.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/RecipientDetailValidatorFieldMapping.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter; +package com.remit.jmecustomer.features.recipientlisting.presenter; public class RecipientDetailValidatorFieldMapping { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddContractInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddContractInterface.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddContractInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddContractInterface.java index 290041c3..8e0b0437 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddContractInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddContractInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.recipientlisting.utils.EditTextConfigurationFactory; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.recipientlisting.utils.EditTextConfigurationFactory; public interface RecipientAddContractInterface extends BaseContractInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBaseViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBaseViewModel.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBaseViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBaseViewModel.java index a2a9450c..0a18fc90 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBaseViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBaseViewModel.java @@ -1,30 +1,28 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; import android.text.TextUtils; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.ValidationRuleModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.AgentModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.ValidationRuleModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.AgentModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; import java.util.List; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; +import static com.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; public abstract class RecipientAddEditBaseViewModel extends BaseViewModel implements RecipientPresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java index d4a56c6c..54a187c6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java @@ -1,55 +1,33 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; import android.text.TextUtils; import android.util.Log; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DynamicValidationModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.ValidationRuleModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.AgentModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.PaymentMethodModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.utils.EditTextConfigurationFactory; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DynamicValidationModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.ValidationRuleModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.AgentModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.PaymentMethodModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.utils.EditTextConfigurationFactory; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.utils.Utils; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ADDRESS; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_CITY; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_EMAIL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME_IN_LOCAL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FULL_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ID_NUMBER; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ID_TYPE; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME_IN_LOCAL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LOCAL_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME_IN_LOCAL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MOBILE_NUMBER; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_NATIVE_COUNTRY; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_PROVINCE; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_REALATION_GROUP; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_TRANSFER_REASON; - /** * @author Preyea R. Regmi * Collaborator class to apply dynamic validation as well as manage state of beneficiary information during add/edit recipient process. @@ -230,14 +208,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().updateValueToWidgetBranchName(null); view.getRecipientAddEditContractInterface().setSubmitButtonEnabled(false); - ValidationRuleModel branchValidationRule = validationRuleModelMap.get(FIELD_BANK_NAME); + ValidationRuleModel branchValidationRule = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME); if (branchValidationRule != null) { branchValidationRule.updateValidity(false); } } public void updateAccountNo(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ACCOUNT_NO); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (recipientInfo.getAgent() == null) { @@ -258,7 +236,7 @@ public class RecipientDetailValidator { public void updateFirstName(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FIRST_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -274,7 +252,7 @@ public class RecipientDetailValidator { } public void updateMiddleName(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_MIDDLE_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -290,7 +268,7 @@ public class RecipientDetailValidator { } public void updateLastName(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_LAST_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -307,7 +285,7 @@ public class RecipientDetailValidator { public void updateFullName(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FULL_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_FULL_NAME); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); @@ -325,7 +303,7 @@ public class RecipientDetailValidator { public void updateCity(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_CITY); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_CITY); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -342,7 +320,7 @@ public class RecipientDetailValidator { public void updateAddress(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ADDRESS); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_ADDRESS); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -359,7 +337,7 @@ public class RecipientDetailValidator { public void updateMobileNumber(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_MOBILE_NUMBER); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_MOBILE_NUMBER); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -376,7 +354,7 @@ public class RecipientDetailValidator { public void updateEmail(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_EMAIL); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_EMAIL); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -400,7 +378,7 @@ public class RecipientDetailValidator { public void updateIdNumber(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ID_NUMBER); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_ID_NUMBER); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -417,7 +395,7 @@ public class RecipientDetailValidator { public void updateFirstNameLocal(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FIRST_NAME_IN_LOCAL); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME_IN_LOCAL); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -434,7 +412,7 @@ public class RecipientDetailValidator { public void updateMiddleNameLocal(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_MIDDLE_NAME_IN_LOCAL); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME_IN_LOCAL); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -451,7 +429,7 @@ public class RecipientDetailValidator { public void updateLastNameLocal(String text) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_LAST_NAME_IN_LOCAL); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME_IN_LOCAL); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { @@ -467,7 +445,7 @@ public class RecipientDetailValidator { } public void updateLocalFullName(String fullName) { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_LOCAL_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_LOCAL_NAME); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(fullName); if (error == null) { @@ -487,7 +465,7 @@ public class RecipientDetailValidator { public void updateBank(PaymentBankModel selectedBank) { if (selectedBank == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_BANK_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME); if (validationRuleModel != null) { recipientInfo.updateSelectedBank(selectedBank); validationRuleModel.updateValidity(true); @@ -504,7 +482,7 @@ public class RecipientDetailValidator { // If dependency are there, override thee validation rule and manage the data //For Branch - ValidationRuleModel branchValidationRule = validationRuleModelMap.get(FIELD_BRANCH_NAME); + ValidationRuleModel branchValidationRule = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME); // if (branchValidationRule != null && branchValidationRule.isFieldRequired() && "True".equalsIgnoreCase(selectedBank.getBranchRequired())) { if (branchValidationRule != null && branchValidationRule.isFieldRequired()) { view.getRecipientAddEditContractInterface().updateValueToWidgetBranchName(null); @@ -522,7 +500,7 @@ public class RecipientDetailValidator { //TODO Test necessary //For Account - ValidationRuleModel accountValidationRule = validationRuleModelMap.get(FIELD_ACCOUNT_NO); + ValidationRuleModel accountValidationRule = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO); if (accountValidationRule != null) { if ("True".equalsIgnoreCase(selectedBank.getIsAccountRequired())) { view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetAccountNo(true, @@ -549,7 +527,7 @@ public class RecipientDetailValidator { this.selectedBankBranch=selectedBranch; if (selectedBranch == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_BRANCH_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME); if (validationRuleModel != null) { if (recipientInfo.updateBranch(selectedBranch)) { @@ -563,7 +541,7 @@ public class RecipientDetailValidator { public void updateProvince(PayoutProvincesModel selectedProvinces) { if (selectedProvinces == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_PROVINCE); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_PROVINCE); if (validationRuleModel != null) { recipientInfo.updateProvince(selectedProvinces); validationRuleModel.updateValidity(true); @@ -578,13 +556,13 @@ public class RecipientDetailValidator { //If this province doesn't have any districts list, then we override the dynamic validation rule if (selectedProvinces.getDistricts() == null || selectedProvinces.getDistricts().size() < 1) { - ValidationRuleModel districtValidationRule = validationRuleModelMap.get(FIELD_DISTRICT); + ValidationRuleModel districtValidationRule = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT); if (districtValidationRule != null) districtValidationRule.updateValidity(true); view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetDistrict(false, null); } else { - ValidationRuleModel districtValidationRule = validationRuleModelMap.get(FIELD_DISTRICT); + ValidationRuleModel districtValidationRule = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT); if (districtValidationRule != null) districtValidationRule.updateValidity(false); view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetDistrict(true, null); @@ -598,7 +576,7 @@ public class RecipientDetailValidator { public void updateDistrict(DropDownDTO selectedDistrict) { if (selectedDistrict == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_DISTRICT); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT); if (validationRuleModel != null) { view.getRecipientAddEditContractInterface().updateValueToWidgetDistrict(selectedDistrict.toString()); recipientInfo.updateDistrict(selectedDistrict); @@ -610,7 +588,7 @@ public class RecipientDetailValidator { public void updateTransfer(DropDownDTO selectedTransferReason) { if (selectedTransferReason == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_TRANSFER_REASON); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_TRANSFER_REASON); if (validationRuleModel != null) { view.getRecipientAddEditContractInterface().updateValueToWidgetTransferReason(selectedTransferReason.toString()); recipientInfo.updateTransferReason(selectedTransferReason); @@ -623,7 +601,7 @@ public class RecipientDetailValidator { public void updateIdType(DropDownDTO selectedIDType) { if (selectedIDType == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ID_TYPE); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_ID_TYPE); if (validationRuleModel != null) { view.getRecipientAddEditContractInterface().updateValueToWidgetIDType(selectedIDType.toString()); recipientInfo.updateIdType(selectedIDType); @@ -635,7 +613,7 @@ public class RecipientDetailValidator { public void updateRelation(DropDownDTO selectedRelation) { if (selectedRelation == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_REALATION_GROUP); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_REALATION_GROUP); if (validationRuleModel != null) { view.getRecipientAddEditContractInterface().updateValueToWidgetRelation(selectedRelation.toString()); recipientInfo.updateRelation(selectedRelation); @@ -690,14 +668,14 @@ public class RecipientDetailValidator { switch (rule.getField()) { - case FIELD_BANK_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetBankName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if ((recipientInfo.getAgent() != null && recipientInfo.getAgent().getId() != null) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_BANK_NAME, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME, rule); } else { recipientInfo.setAgent(null); view.getRecipientAddEditContractInterface().updateValueToWidgetBankName(null); @@ -705,7 +683,7 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetBankName(rule.isOptional()); break; - case FIELD_BRANCH_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetBranchName( isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), @@ -717,7 +695,7 @@ public class RecipientDetailValidator { recipientInfo.getAgent().getBranch() != null) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_BRANCH_NAME, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME, rule); } else { AgentModel agentModel = recipientInfo.getAgent(); if (agentModel != null) { @@ -730,14 +708,14 @@ public class RecipientDetailValidator { break; - case FIELD_ACCOUNT_NO: + case RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetAccountNo(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if ((recipientInfo.getAgent() != null && recipientInfo.getAgent().getId() != null && checkStringNotEmpty(recipientInfo.getAgent().getAccountNo())) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_ACCOUNT_NO, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO, rule); } else { AgentModel agentModel = recipientInfo.getAgent(); if (agentModel != null) { @@ -749,14 +727,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetAccountNumber(rule.isOptional()); break; - case FIELD_ID_TYPE: + case RecipientDetailValidatorFieldMappingV3.FIELD_ID_TYPE: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetIDType(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getIdType()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_ID_TYPE, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_ID_TYPE, rule); } else { recipientInfo.setIdType(null); view.getRecipientAddEditContractInterface().updateValueToWidgetIDType(null); @@ -764,14 +742,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetIDType(rule.isOptional()); break; - case FIELD_ID_NUMBER: + case RecipientDetailValidatorFieldMappingV3.FIELD_ID_NUMBER: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetIDNumber(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getIdNumber()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_ID_NUMBER, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_ID_NUMBER, rule); } else { recipientInfo.setIdNumber(null); view.getRecipientAddEditContractInterface().updateValueToWidgetIDNumber(null); @@ -779,14 +757,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetIDNumber(rule.isOptional()); break; - case FIELD_FIRST_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetFirstName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getFirstName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_FIRST_NAME, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME, rule); } else { recipientInfo.setFirstName(null); view.getRecipientAddEditContractInterface().updateValueToWidgetFirstName(null); @@ -795,14 +773,14 @@ public class RecipientDetailValidator { break; - case FIELD_MIDDLE_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetMiddleName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getMiddleName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_MIDDLE_NAME, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME, rule); } else { recipientInfo.setMiddleName(null); view.getRecipientAddEditContractInterface().updateValueToWidgetMiddleName(null); @@ -811,14 +789,14 @@ public class RecipientDetailValidator { break; - case FIELD_LAST_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetLastName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getLastName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_LAST_NAME, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME, rule); } else { recipientInfo.setLastName(null); view.getRecipientAddEditContractInterface().updateValueToWidgetLastName(null); @@ -827,14 +805,14 @@ public class RecipientDetailValidator { break; - case FIELD_FULL_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_FULL_NAME: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetFullName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getFullName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_FULL_NAME, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_FULL_NAME, rule); } else { recipientInfo.setFullName(null); @@ -843,14 +821,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetFullName(rule.isOptional()); break; - case FIELD_FIRST_NAME_IN_LOCAL: + case RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME_IN_LOCAL: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetLocalFirstName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getLocalFirstName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_FIRST_NAME_IN_LOCAL, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME_IN_LOCAL, rule); } else { recipientInfo.setLocalFirstName(null); view.getRecipientAddEditContractInterface().updateValueToWidgetLocalFirstName(null); @@ -858,14 +836,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetLocalFirstName(rule.isOptional()); break; - case FIELD_MIDDLE_NAME_IN_LOCAL: + case RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME_IN_LOCAL: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetLocalMiddleName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getLocalMiddleName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_MIDDLE_NAME_IN_LOCAL, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME_IN_LOCAL, rule); } else { recipientInfo.setLocalMiddleName(null); view.getRecipientAddEditContractInterface().updateValueToWidgetLocalMiddleName(null); @@ -873,14 +851,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetLocalMiddleName(rule.isOptional()); break; - case FIELD_LAST_NAME_IN_LOCAL: + case RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME_IN_LOCAL: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetLocalLastName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getLocalLastName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_LAST_NAME_IN_LOCAL, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME_IN_LOCAL, rule); } else { recipientInfo.setLocalLastName(null); view.getRecipientAddEditContractInterface().updateValueToWidgetLocalLastName(null); @@ -888,14 +866,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetLocalLastName(rule.isOptional()); break; - case FIELD_LOCAL_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_LOCAL_NAME: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetLocalFullName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getLocalFullName()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_LOCAL_NAME, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_LOCAL_NAME, rule); } else { recipientInfo.setLocalFullName(null); view.getRecipientAddEditContractInterface().updateValueToWidgetLocalFullName(null); @@ -903,14 +881,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetLocalFullName(rule.isOptional()); break; - case FIELD_MOBILE_NUMBER: + case RecipientDetailValidatorFieldMappingV3.FIELD_MOBILE_NUMBER: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetMobileNumber(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getMobile()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_MOBILE_NUMBER, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_MOBILE_NUMBER, rule); } else { recipientInfo.setMobile(null); view.getRecipientAddEditContractInterface().updateValueToWidgetMobileNumber(null); @@ -918,14 +896,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetMobileNumber(rule.isOptional()); break; - case FIELD_PROVINCE: + case RecipientDetailValidatorFieldMappingV3.FIELD_PROVINCE: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetProvince(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getStateId()) || checkStringNotEmpty(recipientInfo.getState()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_PROVINCE, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_PROVINCE, rule); } else { recipientInfo.setStateId(null); recipientInfo.setState(null); @@ -934,14 +912,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetProvince(rule.isOptional()); break; - case FIELD_DISTRICT: + case RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetDistrict(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getDistrictId()) || checkStringNotEmpty(recipientInfo.getDistrict()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_DISTRICT, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT, rule); } else { recipientInfo.setDistrictId(null); recipientInfo.setDistrict(null); @@ -950,14 +928,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetDistrict(rule.isOptional()); break; - case FIELD_CITY: + case RecipientDetailValidatorFieldMappingV3.FIELD_CITY: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetCity(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getCity()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_CITY, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_CITY, rule); } else { recipientInfo.setCity(null); view.getRecipientAddEditContractInterface().updateValueToWidgetCity(null); @@ -965,14 +943,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetCity(rule.isOptional()); break; - case FIELD_ADDRESS: + case RecipientDetailValidatorFieldMappingV3.FIELD_ADDRESS: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetAddress(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getAddress()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_ADDRESS, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_ADDRESS, rule); } else { recipientInfo.setAddress(null); view.getRecipientAddEditContractInterface().updateValueToWidgetAddress(null); @@ -980,14 +958,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetAddress(rule.isOptional()); break; - case FIELD_REALATION_GROUP: + case RecipientDetailValidatorFieldMappingV3.FIELD_REALATION_GROUP: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetRelation(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getRelationshipId()) || checkStringNotEmpty(recipientInfo.getRelationship()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_REALATION_GROUP, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_REALATION_GROUP, rule); } else { recipientInfo.setRelationshipId(null); recipientInfo.setRelationship(null); @@ -996,14 +974,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetRelation(rule.isOptional()); break; - case FIELD_TRANSFER_REASON: + case RecipientDetailValidatorFieldMappingV3.FIELD_TRANSFER_REASON: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetTransferReason(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getPurposeOfRemitId()) || checkStringNotEmpty(recipientInfo.getPurposeOfRemit()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_TRANSFER_REASON, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_TRANSFER_REASON, rule); } else { recipientInfo.setPurposeOfRemitId(null); @@ -1013,14 +991,14 @@ public class RecipientDetailValidator { view.getRecipientAddEditContractInterface().addOptionalAsHintToWidgetTransferReason(rule.isOptional()); break; - case FIELD_EMAIL: + case RecipientDetailValidatorFieldMappingV3.FIELD_EMAIL: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetEmail(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getEmail()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_EMAIL, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_EMAIL, rule); } else { recipientInfo.setEmail(null); view.getRecipientAddEditContractInterface().updateValueToWidgetEmail(null); @@ -1029,14 +1007,14 @@ public class RecipientDetailValidator { break; - case FIELD_NATIVE_COUNTRY: + case RecipientDetailValidatorFieldMappingV3.FIELD_NATIVE_COUNTRY: view.getRecipientAddEditContractInterface().updateValidationRuleToWidgetNativeCountry(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getNativeCountry()) || rule.isOptional()) rule.updateValidity(true); - validationRuleModelMap.put(FIELD_NATIVE_COUNTRY, rule); + validationRuleModelMap.put(RecipientDetailValidatorFieldMappingV3.FIELD_NATIVE_COUNTRY, rule); } else { recipientInfo.setNativeCountry(null); @@ -1084,7 +1062,7 @@ public class RecipientDetailValidator { switch (rule.getField()) { //Enforcing dynamic validating rule withCountdownTimer drop down value bankList's isBranchRequired - case FIELD_BRANCH_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME: if (rule.isFieldRequired()) { if (recipientInfo.getAgent() != null && recipientInfo.getAgent().getId() != null) { PaymentBankModel selectedBank = availableDynamicValidationModel.getBankFromId(recipientInfo.getAgent().getId()); @@ -1099,7 +1077,7 @@ public class RecipientDetailValidator { break; //Enforcing dynamic validating rule withCountdownTimer drop down value bankList's isAccountRequired - case FIELD_ACCOUNT_NO: + case RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO: if (rule.isFieldRequired()) { if (recipientInfo.getAgent() != null && recipientInfo.getAgent().getId() != null) { PaymentBankModel selectedBank = availableDynamicValidationModel.getBankFromId(recipientInfo.getAgent().getId()); @@ -1115,55 +1093,55 @@ public class RecipientDetailValidator { } - case FIELD_ID_NUMBER: + case RecipientDetailValidatorFieldMappingV3.FIELD_ID_NUMBER: if (rule.isFieldRequired() && !rule.isOptional()) updateIdNumber(recipientInfo.getIdNumber()); break; - case FIELD_FIRST_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME: if (rule.isFieldRequired() && !rule.isOptional()) updateFirstName(recipientInfo.getFirstName()); break; - case FIELD_MIDDLE_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME: if (rule.isFieldRequired() && !rule.isOptional()) updateMiddleName(recipientInfo.getMiddleName()); break; - case FIELD_LAST_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME: if (rule.isFieldRequired() && !rule.isOptional()) updateLastName(recipientInfo.getLastName()); break; - case FIELD_FULL_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_FULL_NAME: if (rule.isFieldRequired() && !rule.isOptional()) updateFullName(recipientInfo.getFullName()); break; - case FIELD_FIRST_NAME_IN_LOCAL: + case RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME_IN_LOCAL: if (rule.isFieldRequired() && !rule.isOptional()) updateFirstNameLocal(recipientInfo.getLocalFirstName()); break; - case FIELD_MIDDLE_NAME_IN_LOCAL: + case RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME_IN_LOCAL: if (rule.isFieldRequired() && !rule.isOptional()) updateMiddleNameLocal(recipientInfo.getLocalMiddleName()); break; - case FIELD_LAST_NAME_IN_LOCAL: + case RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME_IN_LOCAL: if (rule.isFieldRequired() && !rule.isOptional()) updateLastNameLocal(recipientInfo.getLocalLastName()); break; - case FIELD_LOCAL_NAME: + case RecipientDetailValidatorFieldMappingV3.FIELD_LOCAL_NAME: if (rule.isFieldRequired() && !rule.isOptional()) updateLocalFullName(recipientInfo.getLocalFullName()); break; - case FIELD_MOBILE_NUMBER: + case RecipientDetailValidatorFieldMappingV3.FIELD_MOBILE_NUMBER: if (rule.isFieldRequired() && !rule.isOptional()) { clearMobileNumberPrefixAndUpdate(); view.getRecipientAddEditContractInterface().showMobilePrefixAndFlag(gateway.getMobilePrefixFromCountryCode(recipientInfo.getCountryCode()), CountryFlagMapper.getFlagFromCountryCode(recipientInfo.getCountryCode())); @@ -1171,18 +1149,18 @@ public class RecipientDetailValidator { break; - case FIELD_CITY: + case RecipientDetailValidatorFieldMappingV3.FIELD_CITY: if (rule.isFieldRequired() && !rule.isOptional()) updateCity(recipientInfo.getCity()); break; - case FIELD_ADDRESS: + case RecipientDetailValidatorFieldMappingV3.FIELD_ADDRESS: if (rule.isFieldRequired() && !rule.isOptional()) updateAddress(recipientInfo.getAddress()); break; - case FIELD_EMAIL: + case RecipientDetailValidatorFieldMappingV3.FIELD_EMAIL: if (rule.isFieldRequired() && !rule.isOptional()) updateEmail(recipientInfo.getEmail()); break; @@ -1213,7 +1191,7 @@ public class RecipientDetailValidator { if (selectedNativeCountry == null) return; - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_NATIVE_COUNTRY); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_NATIVE_COUNTRY); if (validationRuleModel != null) { view.getRecipientAddEditContractInterface().updateValueToWidgetNativeCountry(selectedNativeCountry.toString()); view.getRecipientAddEditContractInterface().showNativeCountryFlag(CountryFlagMapper.getFlagFromCountryCode(selectedNativeCountry.getCountryCode())); @@ -1229,7 +1207,7 @@ public class RecipientDetailValidator { //Prompt user to select different bank incase of partner is changed by server //Don't clear the data, just show error message and disable update button for the moment public void updateBankValidationWhenPartnerHasChanged() { - ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_BANK_NAME); + ValidationRuleModel validationRuleModel = validationRuleModelMap.get(RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME); if (validationRuleModel != null) { // view.getRecipientAddEditContractInterface().setErrorOnWidgetBank(stringExtractor.getStringFromStringId(R.string.select_different_bank_text)); view.getRecipientAddEditContractInterface().setSubmitButtonEnabled(false); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientPresenterInterface.java similarity index 69% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientPresenterInterface.java index 6648cea6..da0f89a8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientPresenterInterface.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; - -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit; + +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddViewModel.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddViewModel.java index 363328d8..54ab89d5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddViewModel.java @@ -1,23 +1,23 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DynamicValidationModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DynamicValidationModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditViewModel.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditViewModel.java index 62d3b23b..bea60a88 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditViewModel.java @@ -1,28 +1,28 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit; import android.text.TextUtils; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DynamicValidationModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.ValidationRuleModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.AgentModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.BranchModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.recipientlisting.gateway.recipientaddedit.RecipientAddEditGatewayInterface; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DynamicValidationModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.ValidationRuleModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.AgentModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.BranchModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingInteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingInteractorInterface.java similarity index 65% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingInteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingInteractorInterface.java index 818cdde8..44057310 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingInteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingInteractorInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenter.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenter.java index f7dbc153..54227afa 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenter.java @@ -1,17 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.RecipientRelatedDataModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.SendMoneyRequiredData; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.RecipientRelatedDataModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.SendMoneyRequiredData; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenterInterface.java similarity index 70% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenterInterface.java index 54fc0584..e3705f38 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/presenter/recipientlisting/RecipientListingPresenterInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.SendMoneyRequiredData; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.SendMoneyRequiredData; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/EditTextConfigurationFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/EditTextConfigurationFactory.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/EditTextConfigurationFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/EditTextConfigurationFactory.java index 3b4c7996..47bb5c22 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/EditTextConfigurationFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/EditTextConfigurationFactory.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.utils; +package com.remit.jmecustomer.features.recipientlisting.utils; import android.text.InputFilter; import android.text.InputType; import android.view.inputmethod.EditorInfo; import android.widget.EditText; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; public class EditTextConfigurationFactory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/InputFilterFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/InputFilterFactory.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/InputFilterFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/InputFilterFactory.java index d84c1f7c..9d8a7978 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/InputFilterFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/InputFilterFactory.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.utils; +package com.remit.jmecustomer.features.recipientlisting.utils; import android.text.InputFilter; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; public class InputFilterFactory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/ValidationUtils.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/ValidationUtils.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/ValidationUtils.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/ValidationUtils.java index 31eedbac..6def154e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/utils/ValidationUtils.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/utils/ValidationUtils.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.utils; +package com.remit.jmecustomer.features.recipientlisting.utils; import com.google.android.material.textfield.TextInputLayout; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.GMEFormInputField; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.GMEFormInputField; public class ValidationUtils { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java index 12b64800..2605bd4e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; import android.content.Intent; import android.os.Bundle; @@ -12,36 +12,36 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import androidx.transition.TransitionManager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.databinding.FragmentBeneficiaryAddEditBinding; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientlisting.RecipientAddViewModelFactory; -import com.swifttech.remit.jmecustomer.features.recipientlisting.RecipientEditViewModelFactory; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add.RecipientAddViewModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit.RecipientEditViewModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.utils.EditTextConfigurationFactory; -import com.swifttech.remit.jmecustomer.features.recipientlisting.utils.ValidationUtils; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientaddedit.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add.RecipientAddViewModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit.RecipientEditViewModel; +import com.remit.jmecustomer.features.recipientlisting.utils.EditTextConfigurationFactory; +import com.remit.jmecustomer.features.recipientlisting.utils.ValidationUtils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.databinding.FragmentBeneficiaryAddEditBinding; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientlisting.RecipientAddViewModelFactory; +import com.remit.jmecustomer.features.recipientlisting.RecipientEditViewModelFactory; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; +import com.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; import static android.view.View.GONE; -import static com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientaddedit.RecipientAddEditActivity.RECIPIENT_INFO_BUNDLE_KEY; -import static com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY; +import static com.remit.jmecustomer.features.recipientlisting.view.recipientaddedit.RecipientAddEditActivity.RECIPIENT_INFO_BUNDLE_KEY; +import static com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY; public class BeneficiaryAddEditFragment extends BaseFragment implements RecipientAddContractInterface.RecipientAddEditContractInterface, View.OnClickListener { @@ -77,7 +77,7 @@ public class BeneficiaryAddEditFragment extends BaseFragment implements Recipie GenericTextListingDialog idTypeListingDialog; private RecipientAddEditBaseViewModel viewModel; - private ReceiverInfoModel recipientToBeEdited; + private ReceiverInfoModel recipientToBeEdited; private FragmentBeneficiaryAddEditBinding binding; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditTermsFragment.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditTermsFragment.java similarity index 61% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditTermsFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditTermsFragment.java index a69f6dd7..10d53088 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditTermsFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/BeneficiaryAddEditTermsFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; import android.os.Bundle; import android.util.Log; @@ -8,20 +8,19 @@ import android.webkit.WebView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition.NewKycTermsAndConditionFragment; -import com.swifttech.remit.jmecustomer.features.recipientlisting.RecipientAddViewModelFactory; -import com.swifttech.remit.jmecustomer.features.recipientlisting.RecipientEditViewModelFactory; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add.RecipientAddViewModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit.RecipientEditViewModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddEditBaseViewModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.add.RecipientAddViewModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.edit.RecipientEditViewModel; +import com.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition.NewKycTermsAndConditionFragment; +import com.remit.jmecustomer.features.recipientlisting.RecipientAddViewModelFactory; +import com.remit.jmecustomer.features.recipientlisting.RecipientEditViewModelFactory; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import static com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientaddedit.RecipientAddEditActivity.RECIPIENT_INFO_BUNDLE_KEY; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_REGISTER_TERMS; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; +import static com.remit.jmecustomer.features.recipientlisting.view.recipientaddedit.RecipientAddEditActivity.RECIPIENT_INFO_BUNDLE_KEY; +import static com.remit.jmecustomer.utils.Constants.JME_REGISTER_TERMS; public class BeneficiaryAddEditTermsFragment extends WebBrowserFragmentV2 { private RecipientAddEditBaseViewModel viewModel; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java index cd060b83..84cf6334 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientAddEditActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; import android.app.Activity; import android.content.Intent; @@ -8,13 +8,13 @@ import android.view.View; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; import java.util.ArrayList; import java.util.List; @@ -46,7 +46,7 @@ public class RecipientAddEditActivity extends BaseActivity implements RecipientA private BeneficiaryAddEditTermsFragment beneficiaryAddEditTermsFragment; private GenericViewPagerAdapter addBeneficiaryViewPagerAdapter; - private ReceiverInfoModel recipientToBeEdited; + private ReceiverInfoModel recipientToBeEdited; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientBranchListingDialog.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientBranchListingDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientBranchListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientBranchListingDialog.java index 30cfc312..58ee66e1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientBranchListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientaddedit/RecipientBranchListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; +package com.remit.jmecustomer.features.recipientlisting.view.recipientaddedit; import android.app.Dialog; import android.content.Context; @@ -24,17 +24,17 @@ import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.UIStateHandler; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBranchListingRvAdapter; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.UIStateHandler; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBranchListingRvAdapter; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListViewholder.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListViewholder.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListViewholder.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListViewholder.java index d0bf6327..fc5bfac8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListViewholder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListViewholder.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.view.recipientlisting; import android.view.View; import android.widget.ImageView; @@ -6,7 +6,7 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java index 460a1098..971641af 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientListingActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.view.recipientlisting; import android.content.Intent; import android.os.Bundle; @@ -11,19 +11,19 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientlisting.adapter.RecipientListingRvAdapter; -import com.swifttech.remit.jmecustomer.features.recipientlisting.gateway.recipientlisting.RecipientListingGateway; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.SendMoneyRequiredData; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting.RecipientListingPresenter; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting.RecipientListingPresenterInterface; -import com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientaddedit.RecipientAddEditActivity; +import com.remit.jmecustomer.features.recipientlisting.adapter.RecipientListingRvAdapter; +import com.remit.jmecustomer.features.recipientlisting.gateway.recipientlisting.RecipientListingGateway; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.SendMoneyRequiredData; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting.RecipientListingPresenter; +import com.remit.jmecustomer.features.recipientlisting.presenter.recipientlisting.RecipientListingPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.features.recipientlisting.view.recipientaddedit.RecipientAddEditActivity; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientModifyPromptDialog.java b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientModifyPromptDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientModifyPromptDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientModifyPromptDialog.java index 2203f665..9b6ecbcc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientModifyPromptDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientlisting/view/recipientlisting/RecipientModifyPromptDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientlisting.view.recipientlisting; +package com.remit.jmecustomer.features.recipientlisting.view.recipientlisting; import android.app.Dialog; import android.os.Bundle; @@ -7,7 +7,7 @@ import android.view.View; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.ButterKnife; import butterknife.OnClick; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java index c9399a50..a428054e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.adapter; +package com.remit.jmecustomer.features.recipientmanagement.adapter; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; @@ -6,10 +6,10 @@ import android.view.View; import android.view.ViewGroup; import com.bumptech.glide.Glide; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3.RecipientListRVViewholderV3; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3.RecipientListRVViewholderV3; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGateway.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGateway.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGateway.java index 454869f1..a07a44ce 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions; +package com.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGatewayInterface.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGatewayInterface.java index 7f20ee5d..1201f058 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recepientTermsConditions/RecipientTermsGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions; +package com.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java index a1df62f4..c4fe0f73 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java index b97edb80..3a4cc2a8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientaddeditV3/RecipientAddEditV3GatewayInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientlistingV3/RecipientListingV3Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientlistingV3/RecipientListingV3Gateway.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientlistingV3/RecipientListingV3Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientlistingV3/RecipientListingV3Gateway.java index 4988249e..4966c3f9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/gateway/recipientlistingV3/RecipientListingV3Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/gateway/recipientlistingV3/RecipientListingV3Gateway.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3InteractorInterface; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/CountryServiceModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/CountryServiceModel.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/CountryServiceModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/CountryServiceModel.java index c95d91bf..b108c0ab 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/CountryServiceModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/CountryServiceModel.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/ServiceTypeModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/ServiceTypeModel.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/ServiceTypeModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/ServiceTypeModel.java index 46cc6715..f47afd05 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/ServiceTypeModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/countryservice/ServiceTypeModel.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.features.exrate.model.PaymentModeMapper; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.features.exrate.model.PaymentModeMapper; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java index 7aac0761..3d0ce48a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java index fe4a63fe..04e49f9d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java index 8c5621e6..8c3a6173 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PayoutProvincesModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PayoutProvincesModel.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PayoutProvincesModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PayoutProvincesModel.java index 807dfe91..9e342adf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PayoutProvincesModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/PayoutProvincesModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java index 3b87684c..0aaf1315 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation; import android.util.Log; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java index 62a750f1..b9f3d52f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/AgentV3Model.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; import android.os.Parcel; import android.os.Parcelable; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/BranchV3Model.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/BranchV3Model.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/BranchV3Model.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/BranchV3Model.java index 0d74d449..28d517df 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/BranchV3Model.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/BranchV3Model.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; import android.os.Parcel; import android.os.Parcelable; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java index d4359f0f..f8f3d001 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; import android.os.Parcel; import android.os.Parcelable; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java index 29c94258..582dd241 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java index 19a1e830..ed604763 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/RecipientDetailValidatorFieldMappingV3.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/RecipientDetailValidatorFieldMappingV3.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/RecipientDetailValidatorFieldMappingV3.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/RecipientDetailValidatorFieldMappingV3.java index eb7909b4..7ae1fa08 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/RecipientDetailValidatorFieldMappingV3.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/RecipientDetailValidatorFieldMappingV3.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter; +package com.remit.jmecustomer.features.recipientmanagement.presenter; public class RecipientDetailValidatorFieldMappingV3 { diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java new file mode 100644 index 00000000..adeb20b3 --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java @@ -0,0 +1,13 @@ +package com.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions; + +import com.remit.jmecustomer.base.BasePresenterInterface; + +public interface RecipientPresenterTermsInterface extends BasePresenterInterface { + + void verifyEmailCode(String emailCode); + + void requestForOtp(); + + + +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientTermsViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientTermsViewModel.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientTermsViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientTermsViewModel.java index 926ae9e8..c07fcfc0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientTermsViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientTermsViewModel.java @@ -1,21 +1,21 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions; - -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions.RecipientTermsGatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions.RecipientTermsContractInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions; + +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions.RecipientTermsGatewayInterface; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions.RecipientTermsContractInterface; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.Constants.REQUEST_FOR_REC_VALUE; +import static com.remit.jmecustomer.utils.Constants.REQUEST_FOR_REC_VALUE; public class RecipientTermsViewModel extends BaseViewModel implements RecipientPresenterTermsInterface { private final CompositeDisposable compositeDisposable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3ViewModel.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3ViewModel.java index 738b26e0..7f95f78c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddEditBaseV3ViewModel.java @@ -1,27 +1,27 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; import android.text.TextUtils; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.AgentV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.AgentV3Model; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.util.List; @@ -29,7 +29,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.Constants.REQUEST_FOR_REC_VALUE; +import static com.remit.jmecustomer.utils.Constants.REQUEST_FOR_REC_VALUE; public abstract class RecipientAddEditBaseV3ViewModel extends BaseViewModel implements RecipientPresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java index 9160e643..62121579 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java @@ -1,12 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; - -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.common.view.MAutoCompleteTextView; -import com.swifttech.remit.jmecustomer.features.recipientlisting.presenter.recipientaddedit.RecipientAddContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.utils.EditTextConfigurationFactory; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; + +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.common.view.MAutoCompleteTextView; +import com.remit.jmecustomer.features.recipientmanagement.utils.EditTextConfigurationFactory; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; public interface RecipientAddV3ContractInterface extends BaseContractInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java index fe72d7da..81b00a41 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java @@ -1,54 +1,54 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; import android.text.TextUtils; import android.util.Log; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3GatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.AgentV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.PaymentMethodV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.utils.EditTextConfigurationFactory; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3GatewayInterface; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.AgentV3Model; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.PaymentMethodV3Model; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.utils.EditTextConfigurationFactory; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.utils.Utils; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ADDRESS; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_CITY; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_EMAIL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME_IN_LOCAL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FULL_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ID_NUMBER; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ID_TYPE; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME_IN_LOCAL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LOCAL_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME_IN_LOCAL; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MOBILE_NUMBER; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_NATIVE_COUNTRY; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_PROVINCE; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_REALATION_GROUP; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_TRANSFER_REASON; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ACCOUNT_NO; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ADDRESS; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_BANK_NAME; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_BRANCH_NAME; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_CITY; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_DISTRICT; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_EMAIL; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FIRST_NAME_IN_LOCAL; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_FULL_NAME; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ID_NUMBER; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_ID_TYPE; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LAST_NAME_IN_LOCAL; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_LOCAL_NAME; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MIDDLE_NAME_IN_LOCAL; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_MOBILE_NUMBER; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_NATIVE_COUNTRY; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_PROVINCE; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_REALATION_GROUP; +import static com.remit.jmecustomer.features.recipientmanagement.presenter.RecipientDetailValidatorFieldMappingV3.FIELD_TRANSFER_REASON; /** * @author Preyea R. Regmi diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java similarity index 68% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java index e5f4578e..79e9cab0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java @@ -1,15 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; - -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3; + +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java index 45fed15c..19e70942 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java @@ -1,29 +1,29 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add; import android.util.Log; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3GatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientDetailValidatorV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3GatewayInterface; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientDetailValidatorV3; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; import java.util.List; @@ -32,7 +32,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; +import static com.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; /** * Add Beneficiary Use Case, override any base class callback to adjust withCountdownTimer the add use case flow. Base case will handle default flow. diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java new file mode 100644 index 00000000..787b4101 --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java @@ -0,0 +1,7 @@ +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit; + +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientPresenterInterface; + +public interface RecipientEditV3PresenterInterface extends RecipientPresenterInterface { + +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java index ed848e3a..99c59abf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java @@ -1,33 +1,33 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit; import android.text.TextUtils; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3GatewayInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.AgentV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.BranchV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientDetailValidatorV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3GatewayInterface; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.AgentV3Model; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.BranchV3Model; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientDetailValidatorV3; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; import java.util.ArrayList; @@ -39,7 +39,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; +import static com.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; /** * Edit Beneficiary Use Case, override any base class callback to adjust withCountdownTimer the edit use case flow. Base case will handle default flow. diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3InteractorInterface.java similarity index 78% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3InteractorInterface.java index b906cbf7..e5c6b945 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3InteractorInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java index 40574166..268a6384 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java @@ -1,17 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.RecipientRelatedDataModelV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.RecipientRelatedDataModelV3; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.lang.reflect.Type; import java.util.ArrayList; @@ -21,7 +21,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.Constants.REQUEST_FOR_REC_VALUE; +import static com.remit.jmecustomer.utils.Constants.REQUEST_FOR_REC_VALUE; public class RecipientListingV3Presenter extends BasePresenter implements RecipientListingV3PresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java index 4f1df9b5..61336061 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java index 63acd327..f57fb7c2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/EditTextConfigurationFactory.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.utils; +package com.remit.jmecustomer.features.recipientmanagement.utils; import android.text.InputFilter; import android.text.InputType; import android.view.inputmethod.EditorInfo; import android.widget.EditText; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; public class EditTextConfigurationFactory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/InputFilterFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/InputFilterFactory.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/InputFilterFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/InputFilterFactory.java index 4f3426dc..1055b3b4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/InputFilterFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/InputFilterFactory.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.utils; +package com.remit.jmecustomer.features.recipientmanagement.utils; import android.text.InputFilter; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText; +import com.remit.jmecustomer.common.customwidgets.GmeEditText; public class InputFilterFactory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/ValidationUtils.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/ValidationUtils.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/ValidationUtils.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/ValidationUtils.java index c2eda1f2..5217023e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/utils/ValidationUtils.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/utils/ValidationUtils.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.utils; +package com.remit.jmecustomer.features.recipientmanagement.utils; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.GMEFormInputField; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.GMEFormInputField; import com.google.android.material.textfield.TextInputLayout; public class ValidationUtils { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientAddV3ViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientAddV3ViewModelFactory.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientAddV3ViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientAddV3ViewModelFactory.java index a81753da..5889648c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientAddV3ViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientAddV3ViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view; +package com.remit.jmecustomer.features.recipientmanagement.view; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3Gateway; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add.RecipientAddV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3Gateway; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add.RecipientAddV3ViewModel; public class RecipientAddV3ViewModelFactory implements ViewModelProvider.Factory { private RecipientAddV3ContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientEditV3ViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientEditV3ViewModelFactory.java similarity index 59% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientEditV3ViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientEditV3ViewModelFactory.java index 8b62637e..eee4be30 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientEditV3ViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientEditV3ViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view; +package com.remit.jmecustomer.features.recipientmanagement.view; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3Gateway; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit.RecipientEditV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientaddeditV3.RecipientAddEditV3Gateway; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit.RecipientEditV3ViewModel; public class RecipientEditV3ViewModelFactory implements ViewModelProvider.Factory { private final RecipientAddV3ContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientTermsViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientTermsViewModelFactory.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientTermsViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientTermsViewModelFactory.java index 953e3c47..5ef753d1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/RecipientTermsViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/RecipientTermsViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view; +package com.remit.jmecustomer.features.recipientmanagement.view; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions.RecipientTermsGateway; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions.RecipientTermsViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions.RecipientTermsContractInterface; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recepientTermsConditions.RecipientTermsGateway; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions.RecipientTermsViewModel; +import com.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions.RecipientTermsContractInterface; public class RecipientTermsViewModelFactory implements ViewModelProvider.Factory { private RecipientTermsContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/BeneficiaryAddEditV3TermsActivity.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/BeneficiaryAddEditV3TermsActivity.java similarity index 73% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/BeneficiaryAddEditV3TermsActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/BeneficiaryAddEditV3TermsActivity.java index e6176229..e42eaff3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/BeneficiaryAddEditV3TermsActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/BeneficiaryAddEditV3TermsActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions; +package com.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions; import android.content.Intent; import android.os.Bundle; @@ -7,19 +7,18 @@ import android.webkit.WebView; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions.RecipientTermsViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.RecipientTermsViewModelFactory; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyRequestSummaryActivity; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; - -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_BENEFICIARY_TERMS; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions.RecipientTermsViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.features.recipientmanagement.view.RecipientTermsViewModelFactory; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; +import com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; + +import static com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3; +import static com.remit.jmecustomer.utils.Constants.JME_BENEFICIARY_TERMS; public class BeneficiaryAddEditV3TermsActivity extends WebBrowserV2Activity implements GenericEditTextPromptDialog.GenericEditTextPromptListener, RecipientTermsContractInterface { public static final int RECIPIENT_ACTION_TERMS_REQUEST_CODE_v3 = 21346; diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java new file mode 100644 index 00000000..7ae4bf2b --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java @@ -0,0 +1,9 @@ +package com.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions; + +import com.remit.jmecustomer.base.BaseContractInterface; + +public interface RecipientTermsContractInterface extends BaseContractInterface { + void showEmailCodePromptDialog(); + + void onEmailVerifySuccess(); +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java index 0eec18d2..aa40ea41 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; import android.content.Intent; import android.os.Bundle; @@ -12,40 +12,40 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import androidx.transition.TransitionManager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.common.view.MAutoCompleteTextView; -import com.swifttech.remit.jmecustomer.databinding.FragmentBeneficiaryAddEditV3Binding; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add.RecipientAddV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit.RecipientEditV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.utils.EditTextConfigurationFactory; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.utils.ValidationUtils; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.RecipientAddV3ViewModelFactory; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.RecipientEditV3ViewModelFactory; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.DropDownDTO; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add.RecipientAddV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit.RecipientEditV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.utils.EditTextConfigurationFactory; +import com.remit.jmecustomer.features.recipientmanagement.utils.ValidationUtils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; +import com.remit.jmecustomer.common.customwidgets.common.GenericImageWithTextListingDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.common.view.MAutoCompleteTextView; +import com.remit.jmecustomer.databinding.FragmentBeneficiaryAddEditV3Binding; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.recipientmanagement.view.RecipientAddV3ViewModelFactory; +import com.remit.jmecustomer.features.recipientmanagement.view.RecipientEditV3ViewModelFactory; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; +import com.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; import static android.view.View.GONE; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3; -import static com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY; +import static com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3; +import static com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY; public class BeneficiaryAddEditV3Fragment extends BaseFragment implements RecipientAddV3ContractInterface.RecipientAddEditV3ContractInterface, View.OnClickListener { private final String TAG = BeneficiaryAddEditV3Fragment.class.getSimpleName(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3TermsFragment.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3TermsFragment.java similarity index 69% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3TermsFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3TermsFragment.java index 7e430db6..05e19052 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3TermsFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3TermsFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; import android.os.Bundle; import android.util.Log; @@ -8,20 +8,20 @@ import android.webkit.WebView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add.RecipientAddV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit.RecipientEditV3ViewModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.RecipientAddV3ViewModelFactory; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.RecipientEditV3ViewModelFactory; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; - -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_BENEFICIARY_TERMS; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddEditBaseV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.add.RecipientAddV3ViewModel; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit.RecipientEditV3ViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.features.recipientmanagement.view.RecipientAddV3ViewModelFactory; +import com.remit.jmecustomer.features.recipientmanagement.view.RecipientEditV3ViewModelFactory; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; + +import static com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3; +import static com.remit.jmecustomer.utils.Constants.JME_BENEFICIARY_TERMS; public class BeneficiaryAddEditV3TermsFragment extends WebBrowserFragmentV2 implements RecipientAddV3ContractInterface.RecipientTermsAndConditionsContract, GenericEditTextPromptDialog.GenericEditTextPromptListener { private RecipientAddEditBaseV3ViewModel viewModel; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java index 73d6dd4d..ce85206c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; import android.app.Activity; import android.content.Intent; @@ -8,13 +8,13 @@ import android.view.View; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientBranchListingDialog.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientBranchListingDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientBranchListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientBranchListingDialog.java index 87ca8b95..9252a5ab 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientBranchListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientBranchListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; +package com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3; import android.app.Dialog; import android.content.Context; @@ -23,17 +23,17 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.UIStateHandler; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBranchListingRvAdapter; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.UIStateHandler; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBranchListingRvAdapter; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListRVViewholderV3.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListRVViewholderV3.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListRVViewholderV3.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListRVViewholderV3.java index 98e6fbbd..a569a3ed 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListRVViewholderV3.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListRVViewholderV3.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3; import androidx.recyclerview.widget.RecyclerView; @@ -6,7 +6,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java index 50bfe199..9b84142e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java @@ -1,36 +1,32 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.EditText; import android.widget.FrameLayout; -import androidx.appcompat.app.AlertDialog; import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.adapter.RecipientListingV3RvAdapter; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3.RecipientListingV3Gateway; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3Presenter; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3PresenterInterface; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions.BeneficiaryAddEditV3TermsActivity; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; +import com.remit.jmecustomer.features.recipientmanagement.adapter.RecipientListingV3RvAdapter; +import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3.RecipientListingV3Gateway; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3Presenter; +import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3PresenterInterface; +import com.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions.BeneficiaryAddEditV3TermsActivity; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; import java.util.List; @@ -306,32 +302,26 @@ public class RecipientListingV3Activity extends BaseActivity } private void showBeneficiaryDeleteConfirmDialog(ReceiverInfoV3Model receiverInfoV3Model) { - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); - - builder.setTitle(getString(R.string.delete_beneficiary_title_text)) - - .setMessage(getString(R.string.delete_beneficiary_confirmation_text)) - .setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { -// changeLocaleTest(); - presenter.deleteRecipient(receiverInfoV3Model.getReceiverId()); - } - }) - .setNegativeButton(getString(R.string.no_text), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - dialogInterface.dismiss(); - } - }); - - AlertDialog alert = builder.create(); - alert.show(); - alert.setCancelable(true); - alert.getButton(DialogInterface.BUTTON_POSITIVE).setAllCaps(false); - alert.getButton(DialogInterface.BUTTON_NEGATIVE).setAllCaps(false); - alert.getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(ContextCompat.getColor(this, R.color.black)); - alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(this, R.color.colorPrimary)); + GenericPromptDialog genericPromptDialog = new GenericPromptDialog(); + genericPromptDialog.setTitleMessage(getString(R.string.delete_beneficiary_title_text)); + genericPromptDialog.setBodyMessage(getString(R.string.delete_beneficiary_confirmation_text)); + genericPromptDialog.setIconsRes(-1); + genericPromptDialog.setCancellable(true); + genericPromptDialog.setPositiveBtnString(getString(R.string.yes_text)); + genericPromptDialog.setNegativeBtnString(getString(R.string.no_text)); + genericPromptDialog.setListener(new GenericPromptDialog.GenericDialogPromptListener() { + @Override + public void onNegativeBtnPressed() { + + } + + @Override + public void onPositiveBtnPressed() { + presenter.deleteRecipient(receiverInfoV3Model.getReceiverId()); + } + }); + if (!genericPromptDialog.isAdded()) + genericPromptDialog.show(getSupportFragmentManager(), "DELETEBENEFICIARY"); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientModifyPromptDialog.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientModifyPromptDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientModifyPromptDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientModifyPromptDialog.java index ba2e0fd6..f7afdc8b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientModifyPromptDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientModifyPromptDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3; +package com.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3; import android.app.Dialog; import android.os.Bundle; @@ -7,7 +7,7 @@ import android.view.View; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.ButterKnife; import butterknife.OnClick; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/RegisterViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/register/RegisterViewModelFactory.java similarity index 68% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/RegisterViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/register/RegisterViewModelFactory.java index 6ff1cb35..8de050aa 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/RegisterViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/RegisterViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.register; +package com.remit.jmecustomer.features.register; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.register.gateway.RegisterV2Gateway; -import com.swifttech.remit.jmecustomer.features.register.presenter.RegisterV2Presenter; -import com.swifttech.remit.jmecustomer.features.register.presenter.RegisterV2PresenterInterface; +import com.remit.jmecustomer.features.register.gateway.RegisterV2Gateway; +import com.remit.jmecustomer.features.register.presenter.RegisterV2Presenter; +import com.remit.jmecustomer.features.register.presenter.RegisterV2PresenterInterface; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; public class RegisterViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/gateway/RegisterV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/register/gateway/RegisterV2Gateway.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/gateway/RegisterV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/register/gateway/RegisterV2Gateway.java index a88e74e0..2deda5c7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/gateway/RegisterV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/gateway/RegisterV2Gateway.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.features.register.gateway; +package com.remit.jmecustomer.features.register.gateway; import android.annotation.SuppressLint; import android.content.Context; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.register.model.RegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.register.presenter.RegisterV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.register.presenter.RegisterV2InteractorInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.register.model.RegisterApiResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/model/RegisterApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/register/model/RegisterApiResponse.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/model/RegisterApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/register/model/RegisterApiResponse.java index 76ffe872..8ef8cc19 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/model/RegisterApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/model/RegisterApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.register.model; +package com.remit.jmecustomer.features.register.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2InteractorInterface.java similarity index 68% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2InteractorInterface.java index 27748054..c4681d3b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2InteractorInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.register.presenter; +package com.remit.jmecustomer.features.register.presenter; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.register.model.RegisterApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.register.model.RegisterApiResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2Presenter.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2Presenter.java index 594ca6e7..c8c3577e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2Presenter.java @@ -1,37 +1,33 @@ -package com.swifttech.remit.jmecustomer.features.register.presenter; +package com.remit.jmecustomer.features.register.presenter; import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.google.firebase.messaging.FirebaseMessaging; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.login.model.LoginModelV2; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; -import com.swifttech.remit.jmecustomer.features.register.model.RegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.login.model.LoginModelV2; +import com.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; +import com.remit.jmecustomer.features.register.model.RegisterApiResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.util.List; import java.util.concurrent.TimeUnit; -import io.reactivex.CompletableObserver; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import okhttp3.internal.Util; public class RegisterV2Presenter extends BaseViewModel implements RegisterV2PresenterInterface, RegisterV2InteractorInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2PresenterInterface.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2PresenterInterface.java index 83da17a3..8877fa22 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterV2PresenterInterface.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.register.presenter; +package com.remit.jmecustomer.features.register.presenter; import android.content.Context; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterViewLiveData.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterViewLiveData.java index 003e3487..9cc4e29e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/presenter/RegisterViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/presenter/RegisterViewLiveData.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.register.presenter; +package com.remit.jmecustomer.features.register.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/view/RegisterV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/register/view/RegisterV2Activity.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/register/view/RegisterV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/register/view/RegisterV2Activity.java index 13ee52e9..cfd2aa35 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/register/view/RegisterV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/register/view/RegisterV2Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.register.view; +package com.remit.jmecustomer.features.register.view; import android.annotation.SuppressLint; import android.content.Context; @@ -16,22 +16,22 @@ import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.google.firebase.installations.FirebaseInstallations; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; -import com.swifttech.remit.jmecustomer.features.login.view.LoginV2Activity; -import com.swifttech.remit.jmecustomer.features.register.RegisterViewModelFactory; -import com.swifttech.remit.jmecustomer.features.register.presenter.RegisterV2Presenter; -import com.swifttech.remit.jmecustomer.features.register.presenter.RegisterV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.register.presenter.RegisterViewLiveData; -import com.swifttech.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionAcitivity; +import com.remit.jmecustomer.features.register.presenter.RegisterV2Presenter; +import com.remit.jmecustomer.features.register.presenter.RegisterV2PresenterInterface; +import com.remit.jmecustomer.features.register.presenter.RegisterViewLiveData; +import com.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionAcitivity; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; +import com.remit.jmecustomer.features.login.view.LoginV2Activity; +import com.remit.jmecustomer.features.register.RegisterViewModelFactory; import java.util.List; @@ -41,7 +41,7 @@ import butterknife.OnClick; import io.reactivex.subjects.PublishSubject; import io.reactivex.subjects.Subject; -import static com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity.KYC_FORM_REQUEST_CODE; +import static com.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity.KYC_FORM_REQUEST_CODE; public class RegisterV2Activity extends BaseActivity implements RegisterV2PresenterInterface.RegisterV2ContractInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/ExistingCustomerRegisterViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/ExistingCustomerRegisterViewModelFactory.java similarity index 59% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/ExistingCustomerRegisterViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/ExistingCustomerRegisterViewModelFactory.java index 75d082ed..48451496 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/ExistingCustomerRegisterViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/ExistingCustomerRegisterViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer; +package com.remit.jmecustomer.features.registerv2.existingcustomer; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.gateway.ExistingExistingRegisterV2Gateway; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.registerv2.existingcustomer.gateway.ExistingExistingRegisterV2Gateway; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; public class ExistingCustomerRegisterViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/gateway/ExistingExistingRegisterV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/gateway/ExistingExistingRegisterV2Gateway.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/gateway/ExistingExistingRegisterV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/gateway/ExistingExistingRegisterV2Gateway.java index 2d690f88..5948e67a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/gateway/ExistingExistingRegisterV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/gateway/ExistingExistingRegisterV2Gateway.java @@ -1,17 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.gateway; +package com.remit.jmecustomer.features.registerv2.existingcustomer.gateway; import android.content.Context; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2InteractorInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingCustomerRegistrationRequestDTO.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingCustomerRegistrationRequestDTO.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingCustomerRegistrationRequestDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingCustomerRegistrationRequestDTO.java index f4194d33..248a700e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingCustomerRegistrationRequestDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingCustomerRegistrationRequestDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.model; +package com.remit.jmecustomer.features.registerv2.existingcustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingRegisterApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingRegisterApiResponse.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingRegisterApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingRegisterApiResponse.java index 552fa962..7848f05c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingRegisterApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/model/ExistingRegisterApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.model; +package com.remit.jmecustomer.features.registerv2.existingcustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2InteractorInterface.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2InteractorInterface.java index 0474c219..e770acd3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2InteractorInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.existingcustomer.presenter; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java index 92682094..b730376f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.existingcustomer.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; public interface ExistingCustomerRegisterV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java index 7f2a4eaa..8725c36e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java @@ -1,34 +1,32 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.existingcustomer.presenter; import android.text.TextUtils; import androidx.appcompat.app.AppCompatActivity; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.login.model.LoginModelV2; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingCustomerRegistrationRequestDTO; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.login.model.LoginModelV2; +import com.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; +import com.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingCustomerRegistrationRequestDTO; +import com.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.lang.reflect.Type; -import io.reactivex.CompletableObserver; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; import io.reactivex.observers.DisposableObserver; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationRequestLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationRequestLiveData.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationRequestLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationRequestLiveData.java index cebb6407..45980433 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationRequestLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationRequestLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.existingcustomer.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationSubmitLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationSubmitLiveData.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationSubmitLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationSubmitLiveData.java index 1b0ee283..3aba1eeb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationSubmitLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegistrationSubmitLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.existingcustomer.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegisterV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegisterV2Activity.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegisterV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegisterV2Activity.java index 630a23d2..8547e559 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegisterV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegisterV2Activity.java @@ -1,8 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.view; +package com.remit.jmecustomer.features.registerv2.existingcustomer.view; import android.content.Intent; import android.os.Bundle; -import android.text.InputFilter; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; @@ -10,18 +9,17 @@ import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProvider; import androidx.viewpager.widget.ViewPager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.ExistingKYCV3Activity; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.ExistingCustomerRegisterViewModelFactory; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionAcitivity; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; +import com.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionAcitivity; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.kyc.existingCustomer.view.ExistingKYCV3Activity; +import com.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; +import com.remit.jmecustomer.features.registerv2.existingcustomer.ExistingCustomerRegisterViewModelFactory; import java.util.ArrayList; @@ -29,7 +27,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import static com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.ExistingKYCV3Activity.KYC_EXISTING_FORM_REQUEST_CODE; +import static com.remit.jmecustomer.features.kyc.existingCustomer.view.ExistingKYCV3Activity.KYC_EXISTING_FORM_REQUEST_CODE; public class ExistingCustomerRegisterV2Activity extends BaseActivity implements ExistingCustomerRegisterV2PresenterInterface.ExistingRegisterV2ContractInterface,GenericEditTextPromptDialog.GenericEditTextPromptListener{ diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationRequestFragment.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationRequestFragment.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationRequestFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationRequestFragment.java index 938af1e6..4d5a118a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationRequestFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationRequestFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.view; +package com.remit.jmecustomer.features.registerv2.existingcustomer.view; import android.os.Bundle; import android.text.InputFilter; @@ -14,13 +14,13 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegistrationRequestLiveData; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegistrationRequestLiveData; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.utils.Utils; import com.tsongkha.spinnerdatepicker.SpinnerDatePickerDialogBuilder; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java index 0bda5c85..c14493e9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.view; +package com.remit.jmecustomer.features.registerv2.existingcustomer.view; import android.content.SharedPreferences; import android.os.Bundle; @@ -13,18 +13,17 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import com.google.firebase.installations.FirebaseInstallations; import com.google.firebase.messaging.FirebaseMessaging; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegistrationSubmitLiveData; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegisterViewModel; +import com.remit.jmecustomer.features.registerv2.existingcustomer.presenter.ExistingCustomerRegistrationSubmitLiveData; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/NewRegisterViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/NewRegisterViewModelFactory.java similarity index 59% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/NewRegisterViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/NewRegisterViewModelFactory.java index 4de1489d..4faefacb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/NewRegisterViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/NewRegisterViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer; +package com.remit.jmecustomer.features.registerv2.newcustomer; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.gateway.NewRegisterV2Gateway; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2Presenter; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.registerv2.newcustomer.gateway.NewRegisterV2Gateway; +import com.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2Presenter; +import com.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; public class NewRegisterViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java index ee42053f..53d68e62 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/gateway/NewRegisterV2Gateway.java @@ -1,18 +1,18 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.gateway; +package com.remit.jmecustomer.features.registerv2.newcustomer.gateway; import android.annotation.SuppressLint; import android.content.Context; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2InteractorInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/model/NewRegisterApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/model/NewRegisterApiResponse.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/model/NewRegisterApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/model/NewRegisterApiResponse.java index 0b5e618b..c5ebd2f2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/model/NewRegisterApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/model/NewRegisterApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.model; +package com.remit.jmecustomer.features.registerv2.newcustomer.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java index 871ebfa8..41a51969 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2InteractorInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.newcustomer.presenter; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java index acb0c020..ae1a5dcb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.newcustomer.presenter; import android.text.TextUtils; @@ -6,34 +6,31 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.login.model.LoginModelV2; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.login.model.LoginModelV2; +import com.remit.jmecustomer.features.login.presenter.LoginV2InteractorInterface; +import com.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.util.List; import java.util.concurrent.TimeUnit; -import io.reactivex.CompletableObserver; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; import io.reactivex.observers.DisposableObserver; import io.reactivex.schedulers.Schedulers; -import okhttp3.internal.Util; public class NewRegisterV2Presenter extends BaseViewModel implements NewRegisterV2PresenterInterface, NewRegisterV2InteractorInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java index 257f82be..54ec8c8e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2PresenterInterface.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.newcustomer.presenter; import android.content.Context; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterViewLiveData.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterViewLiveData.java index f397fc6c..c241996e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterViewLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter; +package com.remit.jmecustomer.features.registerv2.newcustomer.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java index c413f35d..f8d4e394 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.view; +package com.remit.jmecustomer.features.registerv2.newcustomer.view; import android.annotation.SuppressLint; import android.content.Context; @@ -18,25 +18,24 @@ import androidx.transition.TransitionManager; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import com.google.firebase.installations.FirebaseInstallations; import com.google.firebase.messaging.FirebaseMessaging; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; -import com.swifttech.remit.jmecustomer.features.login.view.LoginV2Activity; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.NewRegisterViewModelFactory; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2Presenter; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterViewLiveData; -import com.swifttech.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionAcitivity; +import com.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2Presenter; +import com.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterV2PresenterInterface; +import com.remit.jmecustomer.features.registerv2.newcustomer.presenter.NewRegisterViewLiveData; +import com.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionAcitivity; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.kyc.newCustomer.model.NativeCountry; +import com.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity; +import com.remit.jmecustomer.features.login.view.LoginV2Activity; +import com.remit.jmecustomer.features.registerv2.newcustomer.NewRegisterViewModelFactory; import java.util.List; @@ -44,7 +43,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import static com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity.KYC_FORM_REQUEST_CODE; +import static com.remit.jmecustomer.features.kyc.newCustomer.view.KYCV3Activity.KYC_FORM_REQUEST_CODE; public class NewRegisterV2Activity extends BaseActivity implements NewRegisterV2PresenterInterface.NewRegisterV2ContractInterface, GenericEditTextPromptDialog.GenericEditTextPromptListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/RenewIdViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/RenewIdViewModelFactory.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/RenewIdViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/RenewIdViewModelFactory.java index c9b61bb3..87819649 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/RenewIdViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/RenewIdViewModelFactory.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.renewId; +package com.remit.jmecustomer.features.renewId; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.renewId.gateway.RenewFileDownloadGateway; -import com.swifttech.remit.jmecustomer.features.renewId.gateway.RenewIdV2Gateway; -import com.swifttech.remit.jmecustomer.features.renewId.presenter.RenewIdV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.renewId.presenter.RenewIdV2ViewModel; +import com.remit.jmecustomer.features.renewId.gateway.RenewFileDownloadGateway; +import com.remit.jmecustomer.features.renewId.gateway.RenewIdV2Gateway; +import com.remit.jmecustomer.features.renewId.presenter.RenewIdV2PresenterInterface; +import com.remit.jmecustomer.features.renewId.presenter.RenewIdV2ViewModel; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; public class RenewIdViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/gateway/RenewFileDownloadGateway.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/gateway/RenewFileDownloadGateway.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/gateway/RenewFileDownloadGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/gateway/RenewFileDownloadGateway.java index 7b145679..ef52b159 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/gateway/RenewFileDownloadGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/gateway/RenewFileDownloadGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.renewId.gateway; +package com.remit.jmecustomer.features.renewId.gateway; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/gateway/RenewIdV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/gateway/RenewIdV2Gateway.java similarity index 75% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/gateway/RenewIdV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/gateway/RenewIdV2Gateway.java index 22d7ae97..7826c211 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/gateway/RenewIdV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/gateway/RenewIdV2Gateway.java @@ -1,10 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.renewId.gateway; +package com.remit.jmecustomer.features.renewId.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.model.ExistingPersonalInfoDTO; -import com.swifttech.remit.jmecustomer.features.renewId.model.RenewIdRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.renewId.presenter.RenewIdV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.renewId.presenter.RenewIdV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.renewId.model.RenewIdRequestDataDTO; +import com.remit.jmecustomer.utils.https.HttpClientV2; import java.io.File; import java.util.HashMap; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/model/RenewIdRequestDataDTO.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/model/RenewIdRequestDataDTO.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/model/RenewIdRequestDataDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/model/RenewIdRequestDataDTO.java index 4395665e..173c40bd 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/model/RenewIdRequestDataDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/model/RenewIdRequestDataDTO.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.renewId.model; +package com.remit.jmecustomer.features.renewId.model; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2InteractorInterface.java similarity index 52% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2InteractorInterface.java index db24fd7b..30cd128f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2InteractorInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.renewId.presenter; +package com.remit.jmecustomer.features.renewId.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.renewId.model.RenewIdRequestDataDTO; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.renewId.model.RenewIdRequestDataDTO; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2PresenterInterface.java similarity index 56% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2PresenterInterface.java index b188e41d..9ea69fec 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2PresenterInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.renewId.presenter; +package com.remit.jmecustomer.features.renewId.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.renewId.view.RenewUserIdLiveData; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.renewId.view.RenewUserIdLiveData; import java.io.File; @@ -12,13 +12,13 @@ public interface RenewIdV2PresenterInterface extends BasePresenterInterface { void checkImageStatus(int requestCode, int resultCode, File data); - void renewIdSuccessPopup(); + void renewIdSuccessPopup(String message); RenewUserIdLiveData bindRenewUserIdForm(RenewUserIdLiveData.RenewUserIdBinding binding); interface RenewIdContractInterface extends BaseContractInterface { - void onRenewUserIdSuccess(); + void onRenewUserIdSuccess(String successMessage); void exitReneUserIdView(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java index 9243323c..a9f027d4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdV2ViewModel.java @@ -1,20 +1,20 @@ -package com.swifttech.remit.jmecustomer.features.renewId.presenter; - -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.renewId.gateway.RenewFileDownloadGateway; -import com.swifttech.remit.jmecustomer.features.renewId.gateway.RenewIdV2Gateway; -import com.swifttech.remit.jmecustomer.features.renewId.model.RenewIdRequestDataDTO; -import com.swifttech.remit.jmecustomer.features.renewId.view.RenewIdActivity; -import com.swifttech.remit.jmecustomer.features.renewId.view.RenewUserIdLiveData; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.ImageUtils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +package com.remit.jmecustomer.features.renewId.presenter; + +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.login.gateway.LoginV2Gateway; +import com.remit.jmecustomer.features.renewId.gateway.RenewFileDownloadGateway; +import com.remit.jmecustomer.features.renewId.gateway.RenewIdV2Gateway; +import com.remit.jmecustomer.features.renewId.model.RenewIdRequestDataDTO; +import com.remit.jmecustomer.features.renewId.view.RenewIdActivity; +import com.remit.jmecustomer.features.renewId.view.RenewUserIdLiveData; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.ImageUtils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.io.File; @@ -65,34 +65,30 @@ public class RenewIdV2ViewModel extends BaseViewModel implements RenewIdV2Presen @Override public void renewUserId() { - postUserIdToServer(validator.getRenewIdRequestDataDTO(), view::onRenewUserIdSuccess); +// postUserIdToServer(validator.getRenewIdRequestDataDTO(), view::onRenewUserIdSuccess); + postUserIdToServer(validator.getRenewIdRequestDataDTO()); } - private void postUserIdToServer(RenewIdRequestDataDTO renewIdRequestDataDTO, Runnable endWithTask) { + private void postUserIdToServer(RenewIdRequestDataDTO renewIdRequestDataDTO) { compositeDisposable.add( this.renewIdV2Gateway.renewUserId(renewIdV2Gateway.getAuth(), renewIdRequestDataDTO) .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .doFinally(() -> view.showProgressBar(false, "")) - .subscribeWith(new RewNewIdUploadObserver(endWithTask)) + .subscribeWith(new RewNewIdUploadObserver()) ); } public class RewNewIdUploadObserver extends GenericApiObserverResponseV2 { - Runnable task; - public RewNewIdUploadObserver(Runnable task) { - this.task = task; - } @Override protected void onSuccess(GenericResponseDataModel t) { if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { - if (task != null) - task.run(); + view.onRenewUserIdSuccess(t.getMsg()); } else view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null); @@ -147,8 +143,8 @@ public class RenewIdV2ViewModel extends BaseViewModel implements RenewIdV2Presen } @Override - public void renewIdSuccessPopup() { - view.showPopUpMessage(view.getContext().getResources().getString(R.string.renewIdSucess_text), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitReneUserIdView()); + public void renewIdSuccessPopup(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitReneUserIdView()); } @Override diff --git a/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java new file mode 100644 index 00000000..ca2c1f0b --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java @@ -0,0 +1,4 @@ +package com.remit.jmecustomer.features.renewId.presenter; + +class RenewIdViewLiveData { +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/view/RenewIdActivity.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewIdActivity.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/view/RenewIdActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewIdActivity.java index a306284c..b4bf3dbf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/view/RenewIdActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewIdActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.renewId.view; +package com.remit.jmecustomer.features.renewId.view; import android.Manifest; import android.content.ClipData; @@ -22,19 +22,19 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.snackbar.Snackbar; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.view.MTextInputEditText; -import com.swifttech.remit.jmecustomer.common.view.MTextInputLayout; -import com.swifttech.remit.jmecustomer.common.view.MTextView; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.renewId.RenewIdViewModelFactory; -import com.swifttech.remit.jmecustomer.features.renewId.presenter.RenewIdV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.renewId.presenter.RenewIdV2ViewModel; -import com.swifttech.remit.jmecustomer.utils.other.Utility; +import com.remit.jmecustomer.features.renewId.presenter.RenewIdV2PresenterInterface; +import com.remit.jmecustomer.features.renewId.presenter.RenewIdV2ViewModel; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.view.MTextInputEditText; +import com.remit.jmecustomer.common.view.MTextInputLayout; +import com.remit.jmecustomer.common.view.MTextView; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.renewId.RenewIdViewModelFactory; +import com.remit.jmecustomer.utils.other.Utility; import com.theartofdev.edmodo.cropper.CropImage; import java.io.File; @@ -413,8 +413,8 @@ public class RenewIdActivity extends BaseActivity implements RenewIdV2PresenterI } @Override - public void onRenewUserIdSuccess() { - viewModel.renewIdSuccessPopup(); + public void onRenewUserIdSuccess(String message) { + viewModel.renewIdSuccessPopup(message); } @Override diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/view/RenewUserIdLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewUserIdLiveData.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/view/RenewUserIdLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewUserIdLiveData.java index c0893489..a7bcb567 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/view/RenewUserIdLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewUserIdLiveData.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.renewId.view; +package com.remit.jmecustomer.features.renewId.view; import android.graphics.Bitmap; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/ResetPassViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/ResetPassViewModelFactory.java similarity index 64% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/ResetPassViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/ResetPassViewModelFactory.java index 38f658eb..fd5f7ba0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/ResetPassViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/ResetPassViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword; +package com.remit.jmecustomer.features.resetpassword; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.resetpassword.gateway.ResetPassV2Gateway; -import com.swifttech.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2Presenter; -import com.swifttech.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2PresenterInterface; +import com.remit.jmecustomer.features.resetpassword.gateway.ResetPassV2Gateway; +import com.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2Presenter; +import com.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2PresenterInterface; public class ResetPassViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/gateway/ResetPassV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/gateway/ResetPassV2Gateway.java similarity index 57% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/gateway/ResetPassV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/gateway/ResetPassV2Gateway.java index 978561dd..7cc692f4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/gateway/ResetPassV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/gateway/ResetPassV2Gateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.gateway; +package com.remit.jmecustomer.features.resetpassword.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; -import com.swifttech.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/model/Data.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/model/Data.java similarity index 78% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/model/Data.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/model/Data.java index 9be9e654..8822e4de 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/model/Data.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/model/Data.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.model; +package com.remit.jmecustomer.features.resetpassword.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/model/ResetApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/model/ResetApiResponse.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/model/ResetApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/model/ResetApiResponse.java index 941a2778..76a00085 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/model/ResetApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/model/ResetApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.model; +package com.remit.jmecustomer.features.resetpassword.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2InteractorInterface.java similarity index 50% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2InteractorInterface.java index 49b7f295..40cac53c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2InteractorInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.presenter; +package com.remit.jmecustomer.features.resetpassword.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java index e91971ec..95f5e5fb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2Presenter.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.presenter; - -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.resetpassword.gateway.ResetPassV2Gateway; -import com.swifttech.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +package com.remit.jmecustomer.features.resetpassword.presenter; + +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.resetpassword.gateway.ResetPassV2Gateway; +import com.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2PresenterInterface.java similarity index 63% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2PresenterInterface.java index 93fad2c8..f66fc101 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassV2PresenterInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.presenter; +package com.remit.jmecustomer.features.resetpassword.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; public interface ResetPassV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassViewLiveData.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassViewLiveData.java index 1730db99..73f37668 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/presenter/ResetPassViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/presenter/ResetPassViewLiveData.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.presenter; +package com.remit.jmecustomer.features.resetpassword.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/view/ResetPassV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/view/ResetPassV2Activity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/view/ResetPassV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/resetpassword/view/ResetPassV2Activity.java index 13a08fa9..8245c8ff 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/resetpassword/view/ResetPassV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/resetpassword/view/ResetPassV2Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.resetpassword.view; +package com.remit.jmecustomer.features.resetpassword.view; import android.os.Bundle; import android.view.View; @@ -7,16 +7,16 @@ import android.widget.EditText; import androidx.appcompat.widget.AppCompatAutoCompleteTextView; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.resetpassword.ResetPassViewModelFactory; -import com.swifttech.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2Presenter; -import com.swifttech.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.resetpassword.presenter.ResetPassViewLiveData; +import com.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2Presenter; +import com.remit.jmecustomer.features.resetpassword.presenter.ResetPassV2PresenterInterface; +import com.remit.jmecustomer.features.resetpassword.presenter.ResetPassViewLiveData; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.resetpassword.ResetPassViewModelFactory; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.tsongkha.spinnerdatepicker.SpinnerDatePickerDialogBuilder; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManager.java b/app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManager.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManager.java rename to app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManager.java index b43ef51d..6f42f032 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManager.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManager.java @@ -1,27 +1,22 @@ -package com.swifttech.remit.jmecustomer.features.security; - -import android.os.Handler; -import android.widget.Toast; +package com.remit.jmecustomer.features.security; import androidx.appcompat.app.AppCompatActivity; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.security.auth.RemitTxnPinPromptBottomSheetDialog; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitBiometricEncryptionDTO; -import com.swifttech.remit.jmecustomer.features.security.model.RemitTxnParam; -import com.swifttech.remit.jmecustomer.features.security.utils.SecurityUtils; +import com.remit.jmecustomer.features.security.auth.RemitTxnPinPromptBottomSheetDialog; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.features.security.model.RemitTxnParam; +import com.remit.jmecustomer.features.security.utils.SecurityUtils; +import com.remit.jmecustomer.R; -import io.reactivex.Completable; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; +import static com.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; /** * @author Preyea R. Regmi @@ -135,7 +130,7 @@ public class RemitAuthManager { private void showUserPasswordPrompt() { // RemitUserPasswordPromptBottomSheetDialog.showPromptView(this::returnSecretOnly).show(context.getSupportFragmentManager(), RemitUserPasswordPromptBottomSheetDialog.class.getSimpleName()); - RemitTxnPinPromptBottomSheetDialog.showPromptView( new RemitTxnPinPromptBottomSheetDialog.JMETxnOTPUserSubmitListener() { + RemitTxnPinPromptBottomSheetDialog.showPromptView(new RemitTxnPinPromptBottomSheetDialog.JMETxnOTPUserSubmitListener() { @Override public void onTxnPinRecieved(String secretOTP) { returnSecretOnly(secretOTP); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManager1.java b/app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManager1.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManager1.java rename to app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManager1.java index a698f451..5619d093 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManager1.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManager1.java @@ -1,6 +1,5 @@ -package com.swifttech.remit.jmecustomer.features.security; +package com.remit.jmecustomer.features.security; -import android.content.SharedPreferences; import android.os.Build; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyProperties; @@ -13,10 +12,11 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.biometric.BiometricManager; import androidx.biometric.BiometricPrompt; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.utils.Constants; import java.security.Key; import java.security.KeyStore; @@ -33,30 +33,30 @@ import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.PREF_DEFAULT_ENCRYPTED; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.PREF_DEFAULT_INITIALIZATION_VECTOR; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.PREF_LOGIN_CREDENTIALS_DATA_ENCRYPTED; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.PREF_LOGIN_CREDENTIALS_INITIALIZATION_VECTOR; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.PREF_PIN_DATA_ENCRYPTED; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.PREF_PIN_INITIALIZATION_VECTOR; -import static com.swifttech.remit.jmecustomer.utils.Constants.ACTION_DECRYPT; -import static com.swifttech.remit.jmecustomer.utils.Constants.ACTION_ENCRYPT; -import static com.swifttech.remit.jmecustomer.utils.Constants.ALGORITHM; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_HW_UNAVAILABLE; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NONE_ENROLLED; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NO_HARDWARE; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_SUCCESS; -import static com.swifttech.remit.jmecustomer.utils.Constants.BLOCK_MODE; -import static com.swifttech.remit.jmecustomer.utils.Constants.DEFAULT; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEYS_TORE; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEY_DEFAULT_NAME; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEY_LOGIN_CREDENTIALS_NAME; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEY_PIN_NAME; -import static com.swifttech.remit.jmecustomer.utils.Constants.LOGIN; -import static com.swifttech.remit.jmecustomer.utils.Constants.PADDING; -import static com.swifttech.remit.jmecustomer.utils.Constants.PIN; -import static com.swifttech.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; +import static com.remit.jmecustomer.base.PrefKeys.PREF_DEFAULT_ENCRYPTED; +import static com.remit.jmecustomer.base.PrefKeys.PREF_DEFAULT_INITIALIZATION_VECTOR; +import static com.remit.jmecustomer.base.PrefKeys.PREF_LOGIN_CREDENTIALS_DATA_ENCRYPTED; +import static com.remit.jmecustomer.base.PrefKeys.PREF_LOGIN_CREDENTIALS_INITIALIZATION_VECTOR; +import static com.remit.jmecustomer.base.PrefKeys.PREF_PIN_DATA_ENCRYPTED; +import static com.remit.jmecustomer.base.PrefKeys.PREF_PIN_INITIALIZATION_VECTOR; +import static com.remit.jmecustomer.utils.Constants.ACTION_DECRYPT; +import static com.remit.jmecustomer.utils.Constants.ACTION_ENCRYPT; +import static com.remit.jmecustomer.utils.Constants.ALGORITHM; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_HW_UNAVAILABLE; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NONE_ENROLLED; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NO_HARDWARE; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_SUCCESS; +import static com.remit.jmecustomer.utils.Constants.BLOCK_MODE; +import static com.remit.jmecustomer.utils.Constants.DEFAULT; +import static com.remit.jmecustomer.utils.Constants.KEYS_TORE; +import static com.remit.jmecustomer.utils.Constants.KEY_DEFAULT_NAME; +import static com.remit.jmecustomer.utils.Constants.KEY_LOGIN_CREDENTIALS_NAME; +import static com.remit.jmecustomer.utils.Constants.KEY_PIN_NAME; +import static com.remit.jmecustomer.utils.Constants.LOGIN; +import static com.remit.jmecustomer.utils.Constants.PADDING; +import static com.remit.jmecustomer.utils.Constants.PIN; +import static com.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; public class RemitAuthManager1 { private AppCompatActivity activity; @@ -125,13 +125,14 @@ public class RemitAuthManager1 { public void encryptPrompt( String type, - byte[] data + byte[] token, + String userId ) throws Exception { try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { SecretKey secretKey = createKey(type); Cipher cipher = getEncryptCipher(secretKey); - handleEncrypt(type, cipher, data); + handleEncrypt(type, cipher, token,userId); } @@ -164,7 +165,8 @@ public class RemitAuthManager1 { private void handleEncrypt( String type, Cipher cipher, - byte[] data + byte[] token, + String userId ) { ExecutorService executor = Executors.newSingleThreadExecutor(); @@ -184,8 +186,8 @@ public class RemitAuthManager1 { try { Cipher resultCipher = result.getCryptoObject().getCipher(); byte[] iv = resultCipher.getIV(); - byte[] encryptedData = resultCipher.doFinal(data); - saveEncryptedData(type, encryptedData, iv); + byte[] encryptedData = resultCipher.doFinal(token); + saveEncryptedData(type, encryptedData, iv,userId); listener.onRemitAuthSuccess(new RemitAuthSuccessResult(activity.getString(R.string.fingerPrintEnrolledSucessfully_text)), encryptedData); } catch (BadPaddingException e) { e.printStackTrace(); @@ -207,11 +209,13 @@ public class RemitAuthManager1 { private void saveEncryptedData( String type, byte[] dataEncrypted, - byte[] initializationVector + byte[] initializationVector, + String userId ) { switch (type) { case LOGIN: String encryptedDataString=convertToString(dataEncrypted); +// String concatenatedString=userId+ Constants.FINGER_PRINT_DELIMETER+encryptedDataString; RemitApplication.getFingerPrintStorage().edit().putString(PREF_LOGIN_CREDENTIALS_DATA_ENCRYPTED, encryptedDataString).apply(); String initializationVectorString=convertToString(initializationVector); RemitApplication.getFingerPrintStorage().edit().putString(PREF_LOGIN_CREDENTIALS_INITIALIZATION_VECTOR, initializationVectorString).apply(); @@ -370,7 +374,7 @@ public class RemitAuthManager1 { Cipher cipher = getEncryptCipher(secretKey); byte[] iv = cipher.getIV(); byte[] encryptedData = cipher.doFinal(data); - saveEncryptedData(type, encryptedData, iv); + saveEncryptedData(type, encryptedData, iv,""); } } catch (Exception e) { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManagerGateway.java b/app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManagerGateway.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManagerGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManagerGateway.java index 75948f7e..f5279140 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/RemitAuthManagerGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/RemitAuthManagerGateway.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.security; +package com.remit.jmecustomer.features.security; import android.content.SharedPreferences; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; public class RemitAuthManagerGateway extends PrivilegedGateway { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java b/app/src/main/java/com/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java index e5daedcb..7a1e7d6d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.auth; +package com.remit.jmecustomer.features.security.auth; import android.app.Dialog; import android.content.DialogInterface; @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import com.mukesh.OnOtpCompletionListener; import com.mukesh.OtpView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/auth/RemitUserPasswordPromptBottomSheetDialog.java b/app/src/main/java/com/remit/jmecustomer/features/security/auth/RemitUserPasswordPromptBottomSheetDialog.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/auth/RemitUserPasswordPromptBottomSheetDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/security/auth/RemitUserPasswordPromptBottomSheetDialog.java index 26caaece..6907793f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/auth/RemitUserPasswordPromptBottomSheetDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/auth/RemitUserPasswordPromptBottomSheetDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.auth; +package com.remit.jmecustomer.features.security.auth; import android.app.Dialog; import android.os.Bundle; @@ -13,7 +13,7 @@ import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.textfield.TextInputEditText; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitAuthFailedResult.java b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitAuthFailedResult.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitAuthFailedResult.java rename to app/src/main/java/com/remit/jmecustomer/features/security/model/RemitAuthFailedResult.java index c1d1d993..fc637429 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitAuthFailedResult.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitAuthFailedResult.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.model; +package com.remit.jmecustomer.features.security.model; public class RemitAuthFailedResult { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitAuthSuccessResult.java b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitAuthSuccessResult.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitAuthSuccessResult.java rename to app/src/main/java/com/remit/jmecustomer/features/security/model/RemitAuthSuccessResult.java index e821dfaa..00d87821 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitAuthSuccessResult.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitAuthSuccessResult.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.model; +package com.remit.jmecustomer.features.security.model; public class RemitAuthSuccessResult { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitBiometricEncryptionDTO.java b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitBiometricEncryptionDTO.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitBiometricEncryptionDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/security/model/RemitBiometricEncryptionDTO.java index 02580279..479b22cc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitBiometricEncryptionDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitBiometricEncryptionDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.model; +package com.remit.jmecustomer.features.security.model; public class RemitBiometricEncryptionDTO { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitTxnParam.java b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitTxnParam.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitTxnParam.java rename to app/src/main/java/com/remit/jmecustomer/features/security/model/RemitTxnParam.java index 20448e3f..43523b6b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/model/RemitTxnParam.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/model/RemitTxnParam.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.model; +package com.remit.jmecustomer.features.security.model; public class RemitTxnParam { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/AESEncryptionHelper.java b/app/src/main/java/com/remit/jmecustomer/features/security/utils/AESEncryptionHelper.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/AESEncryptionHelper.java rename to app/src/main/java/com/remit/jmecustomer/features/security/utils/AESEncryptionHelper.java index c39608b5..760820fe 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/AESEncryptionHelper.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/utils/AESEncryptionHelper.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.utils; +package com.remit.jmecustomer.features.security.utils; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/SecurityUtils.java b/app/src/main/java/com/remit/jmecustomer/features/security/utils/SecurityUtils.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/SecurityUtils.java rename to app/src/main/java/com/remit/jmecustomer/features/security/utils/SecurityUtils.java index 1ace829c..5d74a95b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/SecurityUtils.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/utils/SecurityUtils.java @@ -1,7 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.utils; - -import android.content.Context; - +package com.remit.jmecustomer.features.security.utils; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/SignatureCheck.java b/app/src/main/java/com/remit/jmecustomer/features/security/utils/SignatureCheck.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/SignatureCheck.java rename to app/src/main/java/com/remit/jmecustomer/features/security/utils/SignatureCheck.java index 3d65c938..f438fd39 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/security/utils/SignatureCheck.java +++ b/app/src/main/java/com/remit/jmecustomer/features/security/utils/SignatureCheck.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.security.utils; +package com.remit.jmecustomer.features.security.utils; import android.content.Context; import android.content.pm.PackageInfo; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/SendMoneyViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/SendMoneyViewModelFactory.java similarity index 66% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/SendMoneyViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/SendMoneyViewModelFactory.java index 92f12c3e..b3da8822 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/SendMoneyViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/SendMoneyViewModelFactory.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney; +package com.remit.jmecustomer.features.sendmoney; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.sendmoney.gateway.SendMoneyV2Gateway; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2PresenterInterface; +import com.remit.jmecustomer.features.sendmoney.gateway.SendMoneyV2Gateway; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2PresenterInterface; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; public class SendMoneyViewModelFactory implements ViewModelProvider.Factory { private final SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface view; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/ExRateCurrencyListingAmountDetailRvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/ExRateCurrencyListingAmountDetailRvAdapter.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/ExRateCurrencyListingAmountDetailRvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/ExRateCurrencyListingAmountDetailRvAdapter.java index da3f139c..6bfd6330 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/ExRateCurrencyListingAmountDetailRvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/ExRateCurrencyListingAmountDetailRvAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.adapter; +package com.remit.jmecustomer.features.sendmoney.adapter; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; @@ -6,11 +6,11 @@ import android.view.View; import android.view.ViewGroup; import com.bumptech.glide.Glide; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.amountdetail.AmountDetailExRateCountryListingDialog; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.amountdetail.ExRateCountryListRvViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; +import com.remit.jmecustomer.features.sendmoney.view.amountdetail.AmountDetailExRateCountryListingDialog; +import com.remit.jmecustomer.features.sendmoney.view.amountdetail.ExRateCountryListRvViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBankListingRvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBankListingRvAdapter.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBankListingRvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBankListingRvAdapter.java index 14366edd..d4122945 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBankListingRvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBankListingRvAdapter.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.adapter; +package com.remit.jmecustomer.features.sendmoney.adapter; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBankListingDialog; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBankListingRvViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBankListingDialog; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBankListingRvViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBranchListingRvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBranchListingRvAdapter.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBranchListingRvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBranchListingRvAdapter.java index f62465fa..4c815f27 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBranchListingRvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/PayoutModeBranchListingRvAdapter.java @@ -1,14 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.adapter; +package com.remit.jmecustomer.features.sendmoney.adapter; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingRvViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingRvViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/SendMoneyPayoutModeRvAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/SendMoneyPayoutModeRvAdapter.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/SendMoneyPayoutModeRvAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/SendMoneyPayoutModeRvAdapter.java index bdfa1a60..7bd718c9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/adapter/SendMoneyPayoutModeRvAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/adapter/SendMoneyPayoutModeRvAdapter.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.adapter; +package com.remit.jmecustomer.features.sendmoney.adapter; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.exrate.model.PaymentModeMapper; -import com.swifttech.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutMode; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.SendMoneyPayoutModeRVViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.exrate.model.PaymentModeMapper; +import com.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutMode; +import com.remit.jmecustomer.features.sendmoney.view.payoutmode.SendMoneyPayoutModeRVViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/gateway/SendMoneyTransactionCompleteV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/gateway/SendMoneyTransactionCompleteV2Gateway.java similarity index 52% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/gateway/SendMoneyTransactionCompleteV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/gateway/SendMoneyTransactionCompleteV2Gateway.java index 4d661941..c09c8fc3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/gateway/SendMoneyTransactionCompleteV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/gateway/SendMoneyTransactionCompleteV2Gateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.gateway; +package com.remit.jmecustomer.features.sendmoney.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/gateway/SendMoneyV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/gateway/SendMoneyV2Gateway.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/gateway/SendMoneyV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/gateway/SendMoneyV2Gateway.java index cb4a486d..f2f8dfed 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/gateway/SendMoneyV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/gateway/SendMoneyV2Gateway.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.gateway; - -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.ExRateAPIRequestBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +package com.remit.jmecustomer.features.sendmoney.gateway; + +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.ExRateAPIRequestBody; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/ExRateAPIRequestBody.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/ExRateAPIRequestBody.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/ExRateAPIRequestBody.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/ExRateAPIRequestBody.java index 376c8e9d..8976dc50 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/ExRateAPIRequestBody.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/ExRateAPIRequestBody.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model; +package com.remit.jmecustomer.features.sendmoney.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyAPIRequestBody.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyAPIRequestBody.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyAPIRequestBody.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyAPIRequestBody.java index 8e2f297a..bbbb006f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyAPIRequestBody.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyAPIRequestBody.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model; +package com.remit.jmecustomer.features.sendmoney.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyRequiredDataV3.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyRequiredDataV3.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyRequiredDataV3.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyRequiredDataV3.java index 54ece02b..5d05a9ff 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyRequiredDataV3.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyRequiredDataV3.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model; +package com.remit.jmecustomer.features.sendmoney.model; import android.os.Parcel; import android.os.Parcelable; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; public class SendMoneyRequiredDataV3 implements Parcelable { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java index b12b28e0..d72a22bb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model; +package com.remit.jmecustomer.features.sendmoney.model; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.Utils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteV2ResponseBody.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteV2ResponseBody.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteV2ResponseBody.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteV2ResponseBody.java index 7d52672c..02d57850 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteV2ResponseBody.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteV2ResponseBody.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model; +package com.remit.jmecustomer.features.sendmoney.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionResponseBody.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionResponseBody.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionResponseBody.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionResponseBody.java index 1054d9bf..30a16222 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionResponseBody.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionResponseBody.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model; +package com.remit.jmecustomer.features.sendmoney.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/AmountDetailRelatedDataModel.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/AmountDetailRelatedDataModel.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/AmountDetailRelatedDataModel.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/AmountDetailRelatedDataModel.java index f51599c9..90b0b4da 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/AmountDetailRelatedDataModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/AmountDetailRelatedDataModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail; +package com.remit.jmecustomer.features.sendmoney.model.amountdetail; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/BranchListApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/BranchListApiResponse.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/BranchListApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/BranchListApiResponse.java index 4244841d..22086858 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/BranchListApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/BranchListApiResponse.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail; +package com.remit.jmecustomer.features.sendmoney.model.amountdetail; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/RecipientCurrencyModel.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/RecipientCurrencyModel.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/RecipientCurrencyModel.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/RecipientCurrencyModel.java index ff6d2374..a366ff38 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/amountdetail/RecipientCurrencyModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/amountdetail/RecipientCurrencyModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail; +package com.remit.jmecustomer.features.sendmoney.model.amountdetail; public class RecipientCurrencyModel { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/ccdi/CCDIDataDto.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/ccdi/CCDIDataDto.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/ccdi/CCDIDataDto.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/ccdi/CCDIDataDto.java index 721d3bbb..43ec9f44 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/ccdi/CCDIDataDto.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/ccdi/CCDIDataDto.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.ccdi; +package com.remit.jmecustomer.features.sendmoney.model.ccdi; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/AccountValidationApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/AccountValidationApiResponse.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/AccountValidationApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/AccountValidationApiResponse.java index 7aace54e..0cde1610 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/AccountValidationApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/AccountValidationApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode; +package com.remit.jmecustomer.features.sendmoney.model.payoutmode; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/BankBranchDTO.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/BankBranchDTO.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/BankBranchDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/BankBranchDTO.java index ff5c73e1..f78ece86 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/BankBranchDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/BankBranchDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode; +package com.remit.jmecustomer.features.sendmoney.model.payoutmode; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/BankList.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/BankList.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/BankList.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/BankList.java index 19a9566a..2749b45c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/BankList.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/BankList.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode; +package com.remit.jmecustomer.features.sendmoney.model.payoutmode; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutMode.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutMode.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutMode.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutMode.java index d13bf69d..a9dacf3d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutMode.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutMode.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode; +package com.remit.jmecustomer.features.sendmoney.model.payoutmode; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeApiResponse.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeApiResponse.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeApiResponse.java index 6ef045bf..cddf690b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode; +package com.remit.jmecustomer.features.sendmoney.model.payoutmode; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeModel.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeModel.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeModel.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeModel.java index b9a9507f..b05121af 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/payoutmode/PayoutModeModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode; +package com.remit.jmecustomer.features.sendmoney.model.payoutmode; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/verification/VerificationViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/verification/VerificationViewModel.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/verification/VerificationViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/verification/VerificationViewModel.java index 38d96bdd..2b0f01a6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/verification/VerificationViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/verification/VerificationViewModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.model.verification; +package com.remit.jmecustomer.features.sendmoney.model.verification; public class VerificationViewModel { String firstName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2InteractorInterface.java similarity index 54% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2InteractorInterface.java index 93d7a4f8..4c639955 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2InteractorInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.presenter; +package com.remit.jmecustomer.features.sendmoney.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java index aafb4db7..f56995b7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.presenter; - -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +package com.remit.jmecustomer.features.sendmoney.presenter; + +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java similarity index 62% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java index ff60a5e2..846cafd3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.presenter; +package com.remit.jmecustomer.features.sendmoney.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; public interface SendMoneyTransactionCompleteV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2InteractorInterface.java similarity index 79% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2InteractorInterface.java index 5f3ffc04..f2fa3bc3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2InteractorInterface.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.presenter; - -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; +package com.remit.jmecustomer.features.sendmoney.presenter; + +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2PresenterInterface.java similarity index 60% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2PresenterInterface.java index 0e5a361b..69540ad6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2PresenterInterface.java @@ -1,22 +1,21 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.presenter; +package com.remit.jmecustomer.features.sendmoney.presenter; import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.personal.CustomerDetailViewLiveData; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.ccdi.CCIDDetailViewLiveData; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.verification.VerificationViewModel; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.sendmoney.view.ccdi.CCIDDetailViewLiveData; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationModel; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.verification.VerificationViewModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java index 1b662e15..5cdcaf0d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2ViewModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.presenter; +package com.remit.jmecustomer.features.sendmoney.presenter; import android.util.Log; @@ -6,38 +6,38 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationModel; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoModelV2; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitTxnParam; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.ccdi.CCDIDataDto; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.verification.VerificationViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.ccdi.CCIDDetailViewLiveData; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationModel; +import com.remit.jmecustomer.features.home.model.UserInfoModelV2; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.features.security.model.RemitTxnParam; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; +import com.remit.jmecustomer.features.sendmoney.model.ccdi.CCDIDataDto; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.verification.VerificationViewModel; +import com.remit.jmecustomer.features.sendmoney.view.ccdi.CCIDDetailViewLiveData; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; import java.lang.reflect.Type; import java.util.ArrayList; @@ -49,7 +49,7 @@ import io.reactivex.disposables.CompositeDisposable; import io.reactivex.observers.DisposableObserver; import io.reactivex.schedulers.Schedulers; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; +import static com.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS; public class SendMoneyV2ViewModel extends BaseViewModel implements SendMoneyV2PresenterInterface, SendMoneyV2InteractorInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyActionListener.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyActionListener.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyActionListener.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyActionListener.java index ae62b104..78076a1c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyActionListener.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyActionListener.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view; +package com.remit.jmecustomer.features.sendmoney.view; /** * Created by Preyea diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java index 1937c5c4..821d3631 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view; +package com.remit.jmecustomer.features.sendmoney.view; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -20,20 +20,20 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.sendmoney.gateway.SendMoneyTransactionCompleteV2Gateway; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2Presenter; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.support.view.SupportActivityV2; +import com.remit.jmecustomer.features.sendmoney.gateway.SendMoneyTransactionCompleteV2Gateway; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2Presenter; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2PresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.support.view.SupportActivityV2; import butterknife.BindView; import butterknife.ButterKnife; -import static com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2.BUNDLE_ACTION_FETCH_ALL_DATA; +import static com.remit.jmecustomer.features.home.view.HomeActivityV2.BUNDLE_ACTION_FETCH_ALL_DATA; public class SendMoneyRequestSummaryActivity extends BaseActivity implements SendMoneyTransactionCompleteV2PresenterInterface.SendMoneyTransactionCompleteV2PresenterInterfaceV2ContractInterface, View.OnClickListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java similarity index 75% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java index 75a6db36..30e2010c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyScreenManager.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view; +package com.remit.jmecustomer.features.sendmoney.view; import androidx.annotation.LayoutRes; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.amountdetail.AmountDetailSendMoneyFragment; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.ccdi.CCDISendMoneyFragment; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.consent.UserConsentSendMoneyFragment; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.verification.VerificationSendMoneyFragment; +import com.remit.jmecustomer.features.sendmoney.view.amountdetail.AmountDetailSendMoneyFragment; +import com.remit.jmecustomer.features.sendmoney.view.ccdi.CCDISendMoneyFragment; +import com.remit.jmecustomer.features.sendmoney.view.consent.UserConsentSendMoneyFragment; +import com.remit.jmecustomer.features.sendmoney.view.verification.VerificationSendMoneyFragment; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; public class SendMoneyScreenManager { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java index 196f29c4..7fbe1f88 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2Activity.java @@ -1,8 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view; +package com.remit.jmecustomer.features.sendmoney.view; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.TextView; @@ -13,22 +12,21 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProviders; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.view.AnswerInputDialog; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3.RecipientListingV3Activity; -import com.swifttech.remit.jmecustomer.features.sendmoney.SendMoneyViewModelFactory; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity; +import com.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3.RecipientListingV3Activity; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2PresenterInterface; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.view.AnswerInputDialog; +import com.remit.jmecustomer.features.sendmoney.SendMoneyViewModelFactory; import butterknife.BindView; import butterknife.ButterKnife; -import static com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3; - public class SendMoneyV2Activity extends BaseActivity implements SendMoneyActionListener, SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface, WebBrowserFragmentV2.WebBrowserFragmentActionListener, View.OnClickListener { private static final int PASSWORD_PROMPT_REQUEST = 43266; @@ -67,7 +65,7 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction if (savedInstanceState == null) { try { - sendMoneyRequiredData = getIntent().getExtras().getParcelable(RECIPIENT_INFO_BUNDLE_KEY_v3); + sendMoneyRequiredData = getIntent().getExtras().getParcelable(RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3); } catch (Exception e) { sendMoneyRequiredData = null; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java index c054e9a9..b3dc001b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view; +package com.remit.jmecustomer.features.sendmoney.view; import android.content.Intent; import android.graphics.Bitmap; @@ -20,20 +20,20 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.sendmoney.gateway.SendMoneyTransactionCompleteV2Gateway; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2Presenter; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.support.view.SupportActivityV2; +import com.remit.jmecustomer.features.sendmoney.gateway.SendMoneyTransactionCompleteV2Gateway; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteModel; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2Presenter; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyTransactionCompleteV2PresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.support.view.SupportActivityV2; import butterknife.BindView; import butterknife.ButterKnife; -import static com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2.BUNDLE_ACTION_FETCH_ALL_DATA; +import static com.remit.jmecustomer.features.home.view.HomeActivityV2.BUNDLE_ACTION_FETCH_ALL_DATA; public class SendMoneyV2TransactionCompleteActivity extends BaseActivity implements SendMoneyTransactionCompleteV2PresenterInterface.SendMoneyTransactionCompleteV2PresenterInterfaceV2ContractInterface, View.OnClickListener { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailExRateCountryListingDialog.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailExRateCountryListingDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailExRateCountryListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailExRateCountryListingDialog.java index e5e2f6a6..e3807876 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailExRateCountryListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailExRateCountryListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.amountdetail; +package com.remit.jmecustomer.features.sendmoney.view.amountdetail; import android.app.Dialog; import android.content.Context; @@ -17,10 +17,10 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.sendmoney.adapter.ExRateCurrencyListingAmountDetailRvAdapter; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; +import com.remit.jmecustomer.features.sendmoney.adapter.ExRateCurrencyListingAmountDetailRvAdapter; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java index 555c21fa..a39a6326 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.amountdetail; +package com.remit.jmecustomer.features.sendmoney.view.amountdetail; import android.app.Activity; import android.content.Context; @@ -24,17 +24,17 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.RecipientCurrencyModel; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; +import com.remit.jmecustomer.utils.Utils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/ExRateCountryListRvViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/ExRateCountryListRvViewHolder.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/ExRateCountryListRvViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/ExRateCountryListRvViewHolder.java index b8c1736a..c2561f6c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/amountdetail/ExRateCountryListRvViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/ExRateCountryListRvViewHolder.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.amountdetail; +package com.remit.jmecustomer.features.sendmoney.view.amountdetail; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java index 28e4a37a..b0dd7385 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/ccdi/CCDISendMoneyFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.ccdi; +package com.remit.jmecustomer.features.sendmoney.view.ccdi; import android.app.Activity; import android.content.Context; @@ -10,15 +10,15 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.databinding.FragmentCcdiSendMoneyV2Binding; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.common.GenericTextListingDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.databinding.FragmentCcdiSendMoneyV2Binding; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; import io.reactivex.subjects.PublishSubject; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/ccdi/CCIDDetailViewLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/ccdi/CCIDDetailViewLiveData.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/ccdi/CCIDDetailViewLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/ccdi/CCIDDetailViewLiveData.java index 6b8cc5b2..d60bba40 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/ccdi/CCIDDetailViewLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/ccdi/CCIDDetailViewLiveData.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.ccdi; +package com.remit.jmecustomer.features.sendmoney.view.ccdi; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.kyc.newCustomer.model.IDTextDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/consent/UserConsentSendMoneyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/consent/UserConsentSendMoneyFragment.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/consent/UserConsentSendMoneyFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/consent/UserConsentSendMoneyFragment.java index d9b4c72f..eb06d8bb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/consent/UserConsentSendMoneyFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/consent/UserConsentSendMoneyFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.consent; +package com.remit.jmecustomer.features.sendmoney.view.consent; import android.app.Activity; import android.os.Bundle; @@ -9,14 +9,14 @@ import android.webkit.WebView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition.NewKycTermsAndConditionFragment; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.kyc.newCustomer.view.termsAndCondition.NewKycTermsAndConditionFragment; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; -import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TRANSACTION_TERMS; +import static com.remit.jmecustomer.utils.Constants.JME_TRANSACTION_TERMS; public class UserConsentSendMoneyFragment extends WebBrowserFragmentV2 { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingDialog.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingDialog.java index 5846e530..88d6a05a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode; +package com.remit.jmecustomer.features.sendmoney.view.payoutmode; import android.app.Dialog; import android.content.Context; @@ -17,10 +17,10 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBankListingRvAdapter; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; +import com.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBankListingRvAdapter; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingRvViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingRvViewHolder.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingRvViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingRvViewHolder.java index c117ef26..a3fb4087 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingRvViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBankListingRvViewHolder.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode; +package com.remit.jmecustomer.features.sendmoney.view.payoutmode; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingDialog.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingDialog.java index 1d94e8ff..92d548b5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode; +package com.remit.jmecustomer.features.sendmoney.view.payoutmode; import android.app.Dialog; import android.content.Context; @@ -24,16 +24,16 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.UIStateHandler; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBranchListingRvAdapter; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.features.sendmoney.adapter.PayoutModeBranchListingRvAdapter; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.UIStateHandler; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingRvViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingRvViewHolder.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingRvViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingRvViewHolder.java index 40e7d6ef..54615606 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingRvViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeBranchListingRvViewHolder.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode; +package com.remit.jmecustomer.features.sendmoney.view.payoutmode; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeSendMoneyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeSendMoneyFragment.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeSendMoneyFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeSendMoneyFragment.java index 69373af6..1f9a9e21 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeSendMoneyFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/PayoutModeSendMoneyFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode; +package com.remit.jmecustomer.features.sendmoney.view.payoutmode; import android.app.Activity; import android.content.Context; @@ -17,21 +17,21 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; -import com.swifttech.remit.jmecustomer.features.sendmoney.adapter.SendMoneyPayoutModeRvAdapter; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutMode; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.features.sendmoney.adapter.SendMoneyPayoutModeRvAdapter; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.BankList; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutMode; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/SendMoneyPayoutModeRVViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/SendMoneyPayoutModeRVViewHolder.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/SendMoneyPayoutModeRVViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/SendMoneyPayoutModeRVViewHolder.java index 4a82e40f..a63b1c8b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/payoutmode/SendMoneyPayoutModeRVViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/payoutmode/SendMoneyPayoutModeRVViewHolder.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode; +package com.remit.jmecustomer.features.sendmoney.view.payoutmode; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/verification/TermsAndConditionV2BrowserActivity.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/verification/TermsAndConditionV2BrowserActivity.java similarity index 69% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/verification/TermsAndConditionV2BrowserActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/verification/TermsAndConditionV2BrowserActivity.java index a075b4f4..fe846f23 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/verification/TermsAndConditionV2BrowserActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/verification/TermsAndConditionV2BrowserActivity.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.verification; +package com.remit.jmecustomer.features.sendmoney.view.verification; import android.webkit.WebView; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity; +import com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; public class TermsAndConditionV2BrowserActivity extends WebBrowserV2Activity { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/verification/VerificationSendMoneyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/verification/VerificationSendMoneyFragment.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/verification/VerificationSendMoneyFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/verification/VerificationSendMoneyFragment.java index 0380fb02..dfdc375c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/verification/VerificationSendMoneyFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/verification/VerificationSendMoneyFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.sendmoney.view.verification; +package com.remit.jmecustomer.features.sendmoney.view.verification; import android.app.Activity; import android.content.Context; @@ -13,19 +13,18 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.verification.VerificationViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; +import com.remit.jmecustomer.features.sendmoney.model.verification.VerificationViewModel; +import com.remit.jmecustomer.features.sendmoney.presenter.SendMoneyV2ViewModel; +import com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyActionListener; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity; import butterknife.BindView; import butterknife.ButterKnife; -import static com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY; - public class VerificationSendMoneyFragment extends BaseFragment implements View.OnClickListener { @BindView(R.id.txt_firstName) @@ -198,7 +197,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View private void openFraudWarning() { WebRequestModel requestModel=(new ViewModelProvider(requireActivity()).get(SendMoneyV2ViewModel.class)).getWebRequestDataForFraudWarning(); Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class); - intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); + intent.putExtra(WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); startActivity(intent); } @@ -209,7 +208,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View // launchActivity(i); WebRequestModel requestModel=(new ViewModelProvider(requireActivity()).get(SendMoneyV2ViewModel.class)).getWebRequestDataForTermsAndCondition(); Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class); - intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); + intent.putExtra(WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); startActivity(intent); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/FingerPrintSetupModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/settings/FingerPrintSetupModelFactory.java similarity index 52% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/FingerPrintSetupModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/FingerPrintSetupModelFactory.java index 5d8f05b3..9b1f25b6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/FingerPrintSetupModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/FingerPrintSetupModelFactory.java @@ -1,15 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.settings; +package com.remit.jmecustomer.features.settings; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.login.gateway.LoginV2Gateway; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2ViewModel; -import com.swifttech.remit.jmecustomer.features.settings.gateway.FingerPrintSetUpGateway; -import com.swifttech.remit.jmecustomer.features.settings.viewModel.FingerPrintSetupPresenterInterface; -import com.swifttech.remit.jmecustomer.features.settings.viewModel.FingerSetupViewModel; +import com.remit.jmecustomer.features.settings.gateway.FingerPrintSetUpGateway; +import com.remit.jmecustomer.features.settings.viewModel.FingerPrintSetupPresenterInterface; +import com.remit.jmecustomer.features.settings.viewModel.FingerSetupViewModel; public class FingerPrintSetupModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/adapter/LanguageSelectionDialogRVAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/settings/adapter/LanguageSelectionDialogRVAdapter.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/adapter/LanguageSelectionDialogRVAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/adapter/LanguageSelectionDialogRVAdapter.java index 91352209..b975c885 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/adapter/LanguageSelectionDialogRVAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/adapter/LanguageSelectionDialogRVAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.settings.adapter; +package com.remit.jmecustomer.features.settings.adapter; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -7,10 +7,10 @@ import android.view.View; import android.view.ViewGroup; import com.bumptech.glide.Glide; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.settings.view.LanguageSelectionDialogItemHolder; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.settings.view.LanguageSelectionDialogItemHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java b/app/src/main/java/com/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java new file mode 100644 index 00000000..dd8cc01b --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java @@ -0,0 +1,16 @@ +package com.remit.jmecustomer.features.settings.gateway; + +import com.remit.jmecustomer.features.settings.viewModel.FingerPrintSetupInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; + +import io.reactivex.Observable; + +public class FingerPrintSetUpGateway extends PrivilegedGateway implements FingerPrintSetupInteractorInterface.FingerPrintSetupGatewayInterface { + @Override + public Observable getTokenFromPassword(String auth, FingerPrintSetupRequestModel fingerPrintSetupRequestModel) { + return HttpClientV2.getInstance().getTokenFromPassword(auth, fingerPrintSetupRequestModel); + } +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java b/app/src/main/java/com/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java similarity index 78% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java index 43721ce6..ef52ce9b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java @@ -1,17 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.settings.gateway; +package com.remit.jmecustomer.features.settings.gateway; import android.content.SharedPreferences; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; import java.util.ArrayList; import java.util.List; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_LANGUAGE; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_LOCALE; +import static com.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; +import static com.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_LANGUAGE; +import static com.remit.jmecustomer.base.PrefKeys.USER_PREFERRED_LOCALE; public class LanguageSelectionGateway implements LanguageSelectionGatewayInterface { @Override @@ -37,30 +37,30 @@ public class LanguageSelectionGateway implements LanguageSelectionGatewayInterfa @Override public void updatePreferredLocaleToStorage(String localeCode) { - SharedPreferences myPreferences = RemitApplication.getStorage(); + SharedPreferences myPreferences = RemitApplication.getFingerPrintStorage(); myPreferences.edit().putString(USER_PREFERRED_LOCALE, localeCode).apply(); } @Override public void updatePreferredCountryToStorage(String countryCode) { - SharedPreferences myPreferences = RemitApplication.getStorage(); + SharedPreferences myPreferences = RemitApplication.getFingerPrintStorage(); myPreferences.edit().putString(USER_PREFERRED_COUNTRY_CODE, countryCode).apply(); } @Override public void updatePreferredLanguageToStorage(String languageString) { - SharedPreferences myPreferences = RemitApplication.getStorage(); + SharedPreferences myPreferences = RemitApplication.getFingerPrintStorage(); myPreferences.edit().putString(USER_PREFERRED_LANGUAGE, languageString).apply(); } @Override public String getPreferredLocale() { - return RemitApplication.getStorage().getString(USER_PREFERRED_LOCALE, "en"); + return RemitApplication.getFingerPrintStorage().getString(USER_PREFERRED_LOCALE, "en"); } @Override public String getPreferredCountryCode() { - return RemitApplication.getStorage().getString(USER_PREFERRED_COUNTRY_CODE, "EN"); + return RemitApplication.getFingerPrintStorage().getString(USER_PREFERRED_COUNTRY_CODE, "EN"); } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/settings/gateway/LanguageSelectionGatewayInterface.java similarity index 72% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/gateway/LanguageSelectionGatewayInterface.java index a1dfc9f3..e5f35a33 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/gateway/LanguageSelectionGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.settings.gateway; +package com.remit.jmecustomer.features.settings.gateway; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/model/FingerPrintSetupRequestModel.java b/app/src/main/java/com/remit/jmecustomer/features/settings/model/FingerPrintSetupRequestModel.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/model/FingerPrintSetupRequestModel.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/model/FingerPrintSetupRequestModel.java index 084c0b49..ed054692 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/model/FingerPrintSetupRequestModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/model/FingerPrintSetupRequestModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.settings.model; +package com.remit.jmecustomer.features.settings.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/model/FingerPrintSetupResponse.java b/app/src/main/java/com/remit/jmecustomer/features/settings/model/FingerPrintSetupResponse.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/model/FingerPrintSetupResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/model/FingerPrintSetupResponse.java index d3c7a221..7c18b18b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/model/FingerPrintSetupResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/model/FingerPrintSetupResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.settings.model; +package com.remit.jmecustomer.features.settings.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java b/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java similarity index 66% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java index 0ef2b3ad..2519f23b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.settings.view; +package com.remit.jmecustomer.features.settings.view; import android.content.Context; import android.os.Bundle; @@ -14,22 +14,27 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.google.android.material.button.MaterialButton; import com.google.android.material.textfield.TextInputEditText; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager1; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; -import com.swifttech.remit.jmecustomer.features.settings.FingerPrintSetupModelFactory; -import com.swifttech.remit.jmecustomer.features.settings.viewModel.FingerPrintSetupPresenterInterface; -import com.swifttech.remit.jmecustomer.features.settings.viewModel.FingerSetupViewModel; +import com.google.android.material.textfield.TextInputLayout; +import com.jakewharton.rxbinding3.widget.RxTextView; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.security.RemitAuthManager1; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.features.settings.FingerPrintSetupModelFactory; +import com.remit.jmecustomer.features.settings.viewModel.FingerPrintSetupPresenterInterface; +import com.remit.jmecustomer.features.settings.viewModel.FingerSetupLiveData; +import com.remit.jmecustomer.features.settings.viewModel.FingerSetupViewModel; import butterknife.BindView; import butterknife.ButterKnife; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NONE_ENROLLED; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_SUCCESS; -import static com.swifttech.remit.jmecustomer.utils.Constants.LOGIN; -import static com.swifttech.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NONE_ENROLLED; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_SUCCESS; +import static com.remit.jmecustomer.utils.Constants.LOGIN; +import static com.remit.jmecustomer.utils.https.HTTPConstants.INVALID_REQUEST; public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment implements View.OnClickListener, FingerPrintSetupPresenterInterface.FingerSetupContractInterface, RemitAuthManager1.RemitAuthListener1 { @@ -44,6 +49,10 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment @BindView(R.id.cancelButton) AppCompatImageView cancelButton; + @BindView(R.id.passwordTxtInputLayout) + TextInputLayout passwordTxtInputLayout; + + private FingerPrintSetupPresenterInterface viewModel; private RemitAuthManager1 remitAuthManager; @@ -70,7 +79,22 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment ButterKnife.bind(this, view); remitAuthManager = new RemitAuthManager1((AppCompatActivity) getActivity()); remitAuthManager.setListener(this); - + FingerSetupLiveData fingerSetupLiveData=viewModel.getFingerPrintRelatedViewEvents(new FingerSetupLiveData.FingerSetupBindings( + RxTextView.textChanges(edVerifyPassword).skipInitialValue() + )); + fingerSetupLiveData.getPasswordInputLiveData().observe(this, this::onPasswordDataReceived); + } + + private void onPasswordDataReceived(FormInputStateDTO formInputStateDTO) { + if (formInputStateDTO.isValid()) { + passwordTxtInputLayout.setError(null); + passwordTxtInputLayout.setErrorEnabled(false); + if (formInputStateDTO.hasData()) + edVerifyPassword.setText(formInputStateDTO.getData()); + } else { + passwordTxtInputLayout.setErrorEnabled(true); + passwordTxtInputLayout.setError(formInputStateDTO.getErrorMessage()); + } } @Override @@ -115,18 +139,18 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment } @Override - public void passwordSubmitSucess(String token) { + public void passwordSubmitSucess(String token,String userId) { Log.d(TAG, "passwordSubmitSucess Token : " + token); if (remitAuthManager.bioMetricCanAuthenticates().equals(BIOMETRIC_SUCCESS)) { - encryptLoginCredentialsWithBioMetric(token); + encryptLoginCredentialsWithBioMetric(token,userId); } else if (remitAuthManager.bioMetricCanAuthenticates().equals(BIOMETRIC_ERROR_NONE_ENROLLED)) { //@Todo 1 } } - private void encryptLoginCredentialsWithBioMetric(String token) { + private void encryptLoginCredentialsWithBioMetric(String token,String userId) { try { - remitAuthManager.encryptPrompt(LOGIN, token.getBytes()); + remitAuthManager.encryptPrompt(LOGIN, token.getBytes(),userId); } catch (Exception e) { e.printStackTrace(); } @@ -181,6 +205,11 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment showToastMessage("Cancelled"); } + @Override + public void showMessageAlertDialog(String bodyMessage) { + ((SettingsView)getActivity()).showMessageAlertDialog(bodyMessage); + } + public interface RemitSucessFailureCallBack { void fingerSucessCallBack(RemitAuthSuccessResult successResult, byte[] data); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/FingerprintEnablePromptActivity.java b/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerprintEnablePromptActivity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/FingerprintEnablePromptActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerprintEnablePromptActivity.java index f6773d0e..08b83488 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/FingerprintEnablePromptActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerprintEnablePromptActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.settings.view; +package com.remit.jmecustomer.features.settings.view; import android.os.Bundle; import android.os.Handler; @@ -10,14 +10,14 @@ import android.widget.TextView; import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/LanguageSelectionDialogItemHolder.java b/app/src/main/java/com/remit/jmecustomer/features/settings/view/LanguageSelectionDialogItemHolder.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/LanguageSelectionDialogItemHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/view/LanguageSelectionDialogItemHolder.java index 0b88bb88..1670f523 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/LanguageSelectionDialogItemHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/view/LanguageSelectionDialogItemHolder.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.settings.view; +package com.remit.jmecustomer.features.settings.view; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -6,7 +6,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/LanguageSelectionListingDialog.java b/app/src/main/java/com/remit/jmecustomer/features/settings/view/LanguageSelectionListingDialog.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/LanguageSelectionListingDialog.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/view/LanguageSelectionListingDialog.java index e56d8528..9a38cc6c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/LanguageSelectionListingDialog.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/view/LanguageSelectionListingDialog.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.settings.view; +package com.remit.jmecustomer.features.settings.view; import android.app.Dialog; import android.content.Context; @@ -17,10 +17,10 @@ import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.settings.adapter.LanguageSelectionDialogRVAdapter; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.features.settings.adapter.LanguageSelectionDialogRVAdapter; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/SettingsView.java b/app/src/main/java/com/remit/jmecustomer/features/settings/view/SettingsView.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/SettingsView.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/view/SettingsView.java index c20cd8cf..2e1eb9e8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/view/SettingsView.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/view/SettingsView.java @@ -1,35 +1,36 @@ -package com.swifttech.remit.jmecustomer.features.settings.view; +package com.remit.jmecustomer.features.settings.view; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.CompoundButton; import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity; -import com.swifttech.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager1; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManagerGateway; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; -import com.swifttech.remit.jmecustomer.features.settings.adapter.LanguageSelectionDialogRVAdapter; -import com.swifttech.remit.jmecustomer.features.settings.gateway.LanguageSelectionGateway; -import com.swifttech.remit.jmecustomer.features.settings.gateway.LanguageSelectionGatewayInterface; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog; +import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialogSingleButton; +import com.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity; +import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.features.security.RemitAuthManager1; +import com.remit.jmecustomer.features.security.RemitAuthManagerGateway; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.features.settings.adapter.LanguageSelectionDialogRVAdapter; +import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGateway; +import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGatewayInterface; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import io.reactivex.disposables.Disposable; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_HW_UNAVAILABLE; -import static com.swifttech.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NO_HARDWARE; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_HW_UNAVAILABLE; +import static com.remit.jmecustomer.utils.Constants.BIOMETRIC_ERROR_NO_HARDWARE; /** @@ -40,14 +41,14 @@ public class SettingsView extends BaseActivity implements FingerSetUpPasswordFra LanguageSelectionGatewayInterface languageSelectionGatewayInterface; @BindView(R.id.view_fingerprint) - SwitchCompat viewFingerPrint; + SwitchCompat viewFingerPrint; @BindView(R.id.view_fingerprint_divider) - View view_fingerprint_divider; - Disposable fingerPrintAuthEnableSubs; - FingerSetUpPasswordFragment fingerSetUpPasswordFragment; - RemitAuthManager remitAuthManager; - RemitAuthManager1 remitAuthManager1; - RemitAuthManagerGateway remitAuthManagerGateway; + View view_fingerprint_divider; + Disposable fingerPrintAuthEnableSubs; + FingerSetUpPasswordFragment fingerSetUpPasswordFragment; + RemitAuthManager remitAuthManager; + RemitAuthManager1 remitAuthManager1; + RemitAuthManagerGateway remitAuthManagerGateway; protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -66,9 +67,8 @@ public class SettingsView extends BaseActivity implements FingerSetUpPasswordFra } else { viewFingerPrint.setChecked(remitAuthManagerGateway.isFingerPrintLoginEnabled()); } - languageSelectionGatewayInterface=new LanguageSelectionGateway(); - /* - if (!remitAuthManager.isBiometricSupportedByDevice()) { + languageSelectionGatewayInterface = new LanguageSelectionGateway(); + /* if (!remitAuthManager.isBiometricSupportedByDevice()) { view_fingerprint.setVisibility(View.GONE); view_fingerprint_divider.setVisibility(View.GONE); } else { @@ -130,8 +130,8 @@ public class SettingsView extends BaseActivity implements FingerSetUpPasswordFra private void changeLocale(LanguageModel lang) { languageSelectionGatewayInterface.updatePreferredLocaleToStorage(lang.getLocaleCode()); - languageSelectionGatewayInterface.updatePreferredCountryToStorage(lang.getCountryCode()); languageSelectionGatewayInterface.updatePreferredLanguageToStorage(lang.getCountryName()); + languageSelectionGatewayInterface.updatePreferredCountryToStorage(lang.getCountryCode()); restartApp(); } @@ -234,4 +234,16 @@ public class SettingsView extends BaseActivity implements FingerSetUpPasswordFra remitAuthManagerGateway.setFingerPrintLoginStatus(false); } } + + public void showMessageAlertDialog(String bodyMessage) { + this.fingerSetUpPasswordFragment.dismiss(); + GenericPromptDialogSingleButton genericPromptDialog = new GenericPromptDialogSingleButton(); + genericPromptDialog.setTitleMessage(getString(R.string.info_text)); + genericPromptDialog.setBodyMessage(bodyMessage); + genericPromptDialog.setIconsRes(-1); + genericPromptDialog.setCancellable(true); + genericPromptDialog.setPositiveBtnString(getString(R.string.ok_text)); + if (!genericPromptDialog.isAdded()) + genericPromptDialog.show(getSupportFragmentManager(), "PROMPTAPIRESPONSE"); + } } diff --git a/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java new file mode 100644 index 00000000..a9a740c0 --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java @@ -0,0 +1,18 @@ +package com.remit.jmecustomer.features.settings.viewModel; + +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; + +import io.reactivex.Observable; + +public interface FingerPrintSetupInteractorInterface extends BaseInteractorInterface { + interface FingerPrintSetupGatewayInterface extends PrivilegedGatewayInterface + { + Observable getTokenFromPassword( + String auth, + FingerPrintSetupRequestModel fingerPrintSetupRequestModel + ); + } +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupPresenterInterface.java similarity index 56% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupPresenterInterface.java index 46a95e6d..58cb82cf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupPresenterInterface.java @@ -1,7 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.settings.viewModel; +package com.remit.jmecustomer.features.settings.viewModel; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.features.login.presenter.LoginViewLiveData; +import com.remit.jmecustomer.base.BaseContractInterface; public interface FingerPrintSetupPresenterInterface { @@ -12,6 +11,8 @@ public interface FingerPrintSetupPresenterInterface { boolean validateFormOnButtonClick(String Password); interface FingerSetupContractInterface extends BaseContractInterface { - void passwordSubmitSucess(String token); + void passwordSubmitSucess(String token,String userId); + + void showMessageAlertDialog(String bodyMessage); } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerSetupLiveData.java b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerSetupLiveData.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerSetupLiveData.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerSetupLiveData.java index ff365b34..00d71074 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerSetupLiveData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerSetupLiveData.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.settings.viewModel; +package com.remit.jmecustomer.features.settings.viewModel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.common.model.FormInputStateDTO; import io.reactivex.Observable; public class FingerSetupLiveData { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerSetupViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerSetupViewModel.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerSetupViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerSetupViewModel.java index 45fbe6f4..cc6aa93a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerSetupViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/viewModel/FingerSetupViewModel.java @@ -1,17 +1,17 @@ -package com.swifttech.remit.jmecustomer.features.settings.viewModel; +package com.remit.jmecustomer.features.settings.viewModel; import androidx.appcompat.app.AppCompatActivity; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.features.settings.gateway.FingerPrintSetUpGateway; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.model.FormInputStateDTO; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.features.settings.gateway.FingerPrintSetUpGateway; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; @@ -113,7 +113,7 @@ public class FingerSetupViewModel extends BaseViewModel implements FingerPrintSe } private void onTokenGetSucess(FingerPrintSetupResponse fingerPrintSetupResponse) { - view.passwordSubmitSucess(fingerPrintSetupResponse.getId()); + view.passwordSubmitSucess(fingerPrintSetupResponse.getId(),gateway.getUserID()); } public class FingerPrintTokenObserver extends GenericApiObserverResponse { @@ -122,6 +122,8 @@ public class FingerSetupViewModel extends BaseViewModel implements FingerPrintSe protected void onSuccess(FingerPrintSetupResponse fingerPrintSetupResponse) { if(fingerPrintSetupResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)){ onTokenGetSucess(fingerPrintSetupResponse); + }else{ + view.showMessageAlertDialog(fingerPrintSetupResponse.getMsg()); } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/LanguageSelectionRVAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/LanguageSelectionRVAdapter.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/LanguageSelectionRVAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/LanguageSelectionRVAdapter.java index 83ebe6b4..72bb821a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/LanguageSelectionRVAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/LanguageSelectionRVAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.adapter; +package com.remit.jmecustomer.features.splashscreen.adapter; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -9,10 +9,10 @@ import android.view.View; import android.view.ViewGroup; import com.bumptech.glide.Glide; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; -import com.swifttech.remit.jmecustomer.features.splashscreen.view.LanguageSelectionItemViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.features.splashscreen.view.LanguageSelectionItemViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/PayoutModeSelectionRVAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/PayoutModeSelectionRVAdapter.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/PayoutModeSelectionRVAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/PayoutModeSelectionRVAdapter.java index e5feefcd..051dbbbe 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/PayoutModeSelectionRVAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/PayoutModeSelectionRVAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.adapter; +package com.remit.jmecustomer.features.splashscreen.adapter; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -6,10 +6,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; -import com.swifttech.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; -import com.swifttech.remit.jmecustomer.features.splashscreen.view.PayoutModeSelectionItemViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; +import com.remit.jmecustomer.features.splashscreen.view.PayoutModeSelectionItemViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/ViewPagerAVDSplashAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/ViewPagerAVDSplashAdapter.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/ViewPagerAVDSplashAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/ViewPagerAVDSplashAdapter.java index b94d58db..feadaa9d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/adapter/ViewPagerAVDSplashAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/adapter/ViewPagerAVDSplashAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.adapter; +package com.remit.jmecustomer.features.splashscreen.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/gateway/SplashScreenGateway.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/gateway/SplashScreenGateway.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/gateway/SplashScreenGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/gateway/SplashScreenGateway.java index db295d7a..a902cfa7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/gateway/SplashScreenGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/gateway/SplashScreenGateway.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.gateway; - -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; -import com.swifttech.remit.jmecustomer.features.splashscreen.presenter.SplashScreenInteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +package com.remit.jmecustomer.features.splashscreen.gateway; + +import com.remit.jmecustomer.features.splashscreen.presenter.SplashScreenInteractorInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import java.util.ArrayList; @@ -14,7 +14,7 @@ import java.util.List; import io.reactivex.Observable; -import static com.swifttech.remit.jmecustomer.base.PrefKeys.USER_LOGGED_IN_STATUS; +import static com.remit.jmecustomer.base.PrefKeys.USER_LOGGED_IN_STATUS; public class SplashScreenGateway extends PrivilegedGateway implements SplashScreenInteractorInterface.SplashScreenGatewayInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/model/LanguageModel.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/model/LanguageModel.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/model/LanguageModel.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/model/LanguageModel.java index e4b9254b..eed01da1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/model/LanguageModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/model/LanguageModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.model; +package com.remit.jmecustomer.features.splashscreen.model; public class LanguageModel { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenInteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenInteractorInterface.java similarity index 67% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenInteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenInteractorInterface.java index 7531e473..a745db42 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenInteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenInteractorInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.presenter; +package com.remit.jmecustomer.features.splashscreen.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentServiceSeedValueModel; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java index e816c052..e102e804 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.presenter; - -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.features.settings.gateway.LanguageSelectionGatewayInterface; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +package com.remit.jmecustomer.features.splashscreen.presenter; + +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGatewayInterface; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenterInterface.java similarity index 70% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenterInterface.java index 4911f8d4..1f6e2a54 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenterInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.presenter; +package com.remit.jmecustomer.features.splashscreen.presenter; import android.content.Context; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java index 292503d2..f5770626 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/LanguageSelectionItemViewHolder.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.view; +package com.remit.jmecustomer.features.splashscreen.view; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java similarity index 75% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java index b1c315a5..7baf1625 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/PayoutModeSelectionItemViewHolder.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.view; +package com.remit.jmecustomer.features.splashscreen.view; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import android.view.View; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/SplashScreen.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/SplashScreen.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/SplashScreen.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/SplashScreen.java index f3cc00ac..dc1c559d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/SplashScreen.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/SplashScreen.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.view; +package com.remit.jmecustomer.features.splashscreen.view; import android.content.Context; import android.content.Intent; @@ -38,30 +38,30 @@ import androidx.transition.Transition; import androidx.transition.TransitionListenerAdapter; import androidx.transition.TransitionManager; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.swifttech.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog; -import com.swifttech.remit.jmecustomer.features.exrate.gateway.ExchangeRateGateway; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; -import com.swifttech.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenter; -import com.swifttech.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenterInterface; -import com.swifttech.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; -import com.swifttech.remit.jmecustomer.features.login.view.LoginV2Activity; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.view.ExistingCustomerRegisterV2Activity; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.view.NewRegisterV2Activity; -import com.swifttech.remit.jmecustomer.features.settings.gateway.LanguageSelectionGateway; -import com.swifttech.remit.jmecustomer.features.splashscreen.adapter.LanguageSelectionRVAdapter; -import com.swifttech.remit.jmecustomer.features.splashscreen.adapter.PayoutModeSelectionRVAdapter; -import com.swifttech.remit.jmecustomer.features.splashscreen.gateway.SplashScreenGateway; -import com.swifttech.remit.jmecustomer.features.splashscreen.model.LanguageModel; -import com.swifttech.remit.jmecustomer.features.splashscreen.presenter.SplashScreenPresenter; -import com.swifttech.remit.jmecustomer.features.splashscreen.presenter.SplashScreenPresenterInterface; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.splashscreen.adapter.LanguageSelectionRVAdapter; +import com.remit.jmecustomer.features.splashscreen.adapter.PayoutModeSelectionRVAdapter; +import com.remit.jmecustomer.features.splashscreen.gateway.SplashScreenGateway; +import com.remit.jmecustomer.features.splashscreen.model.LanguageModel; +import com.remit.jmecustomer.features.splashscreen.presenter.SplashScreenPresenter; +import com.remit.jmecustomer.features.splashscreen.presenter.SplashScreenPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; +import com.remit.jmecustomer.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog; +import com.remit.jmecustomer.features.exrate.gateway.ExchangeRateGateway; +import com.remit.jmecustomer.features.exrate.model.datav2.CountryPaymentService; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentMode; +import com.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenter; +import com.remit.jmecustomer.features.exrate.presenter.ExchangeRatePresenterInterface; +import com.remit.jmecustomer.features.exrate.view.SelectedRedBorderDecoration; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.features.login.view.LoginV2Activity; +import com.remit.jmecustomer.features.registerv2.existingcustomer.view.ExistingCustomerRegisterV2Activity; +import com.remit.jmecustomer.features.registerv2.newcustomer.view.NewRegisterV2Activity; +import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGateway; +import com.remit.jmecustomer.utils.Utils; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD1Fragment.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD1Fragment.java similarity index 70% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD1Fragment.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD1Fragment.java index 0f97c312..384704cd 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD1Fragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD1Fragment.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.view.avdfrags; +package com.remit.jmecustomer.features.splashscreen.view.avdfrags; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class SplashAVD1Fragment extends SplashAnimatedViewPagerFragment { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD2Fragment.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD2Fragment.java similarity index 71% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD2Fragment.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD2Fragment.java index d692759a..a1a17941 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD2Fragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD2Fragment.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.view.avdfrags; +package com.remit.jmecustomer.features.splashscreen.view.avdfrags; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class SplashAVD2Fragment extends SplashAnimatedViewPagerFragment { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD3Fragment.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD3Fragment.java similarity index 70% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD3Fragment.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD3Fragment.java index 2af37cf7..6515e7b1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD3Fragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAVD3Fragment.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.view.avdfrags; +package com.remit.jmecustomer.features.splashscreen.view.avdfrags; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; public class SplashAVD3Fragment extends SplashAnimatedViewPagerFragment { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java index 280c2044..ce439bd2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/splashscreen/view/avdfrags/SplashAnimatedViewPagerFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.splashscreen.view.avdfrags; +package com.remit.jmecustomer.features.splashscreen.view.avdfrags; import android.annotation.SuppressLint; import android.os.Bundle; @@ -12,8 +12,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/gateway/SupportActivityV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/support/gateway/SupportActivityV2Gateway.java similarity index 83% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/support/gateway/SupportActivityV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/support/gateway/SupportActivityV2Gateway.java index f5220fe4..6d8a1402 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/gateway/SupportActivityV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/support/gateway/SupportActivityV2Gateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.support.gateway; +package com.remit.jmecustomer.features.support.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; -import com.swifttech.remit.jmecustomer.features.support.presenter.SupportActivityV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.support.presenter.SupportActivityV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/model/SupportActivityV2APIResponse.java b/app/src/main/java/com/remit/jmecustomer/features/support/model/SupportActivityV2APIResponse.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/support/model/SupportActivityV2APIResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/support/model/SupportActivityV2APIResponse.java index b6c4c9aa..399225d5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/model/SupportActivityV2APIResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/support/model/SupportActivityV2APIResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.support.model; +package com.remit.jmecustomer.features.support.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/model/SupportSuccessModel.java b/app/src/main/java/com/remit/jmecustomer/features/support/model/SupportSuccessModel.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/support/model/SupportSuccessModel.java rename to app/src/main/java/com/remit/jmecustomer/features/support/model/SupportSuccessModel.java index 3da25d55..7c520536 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/model/SupportSuccessModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/support/model/SupportSuccessModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.support.model; +package com.remit.jmecustomer.features.support.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2InteractorInterface.java similarity index 69% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2InteractorInterface.java index c3cabde7..7224e62a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2InteractorInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.support.presenter; +package com.remit.jmecustomer.features.support.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2Presenter.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2Presenter.java index d21f2c98..55058126 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2Presenter.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.support.presenter; - -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; -import com.swifttech.remit.jmecustomer.features.support.view.SupportActivityV2; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +package com.remit.jmecustomer.features.support.presenter; + +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; +import com.remit.jmecustomer.features.support.view.SupportActivityV2; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2PresenterInterface.java similarity index 73% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2PresenterInterface.java index 557a45f7..9432a2a7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/presenter/SupportActivityV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/support/presenter/SupportActivityV2PresenterInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.support.presenter; +package com.remit.jmecustomer.features.support.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; public interface SupportActivityV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/view/SupportActivityV2.java b/app/src/main/java/com/remit/jmecustomer/features/support/view/SupportActivityV2.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/support/view/SupportActivityV2.java rename to app/src/main/java/com/remit/jmecustomer/features/support/view/SupportActivityV2.java index c3588a15..0330d9af 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/support/view/SupportActivityV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/support/view/SupportActivityV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.support.view; +package com.remit.jmecustomer.features.support.view; import android.os.Bundle; import android.view.View; @@ -6,16 +6,16 @@ import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.features.support.gateway.SupportActivityV2Gateway; -import com.swifttech.remit.jmecustomer.features.support.presenter.SupportActivityV2Presenter; -import com.swifttech.remit.jmecustomer.features.support.presenter.SupportActivityV2PresenterInterface; +import com.remit.jmecustomer.features.support.gateway.SupportActivityV2Gateway; +import com.remit.jmecustomer.features.support.presenter.SupportActivityV2Presenter; +import com.remit.jmecustomer.features.support.presenter.SupportActivityV2PresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; import butterknife.BindView; import butterknife.ButterKnife; -public class SupportActivityV2 extends BaseActivity implements View.OnClickListener,SupportActivityV2PresenterInterface.SupportActivityV2ContractInterface { +public class SupportActivityV2 extends BaseActivity implements View.OnClickListener, SupportActivityV2PresenterInterface.SupportActivityV2ContractInterface { @BindView(R.id.iv_back) diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/TermsAndConditionViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/TermsAndConditionViewModelFactory.java similarity index 68% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/TermsAndConditionViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/TermsAndConditionViewModelFactory.java index c21c1fc5..dd96c13d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/TermsAndConditionViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/TermsAndConditionViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition; +package com.remit.jmecustomer.features.termsandcondition; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionInteractorInterface; -import com.swifttech.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionPresenterInterface; -import com.swifttech.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionViewModel; +import com.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionInteractorInterface; +import com.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionPresenterInterface; +import com.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionViewModel; public class TermsAndConditionViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/gateway/TermsAndConditionGateway.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/gateway/TermsAndConditionGateway.java similarity index 71% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/gateway/TermsAndConditionGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/gateway/TermsAndConditionGateway.java index ea711f85..2bd5b7fb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/gateway/TermsAndConditionGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/gateway/TermsAndConditionGateway.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.gateway; +package com.remit.jmecustomer.features.termsandcondition.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionInteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/model/TermsDTO.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/model/TermsDTO.java similarity index 92% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/model/TermsDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/model/TermsDTO.java index 47d2702c..76c3a445 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/model/TermsDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/model/TermsDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.model; +package com.remit.jmecustomer.features.termsandcondition.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionInteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionInteractorInterface.java similarity index 67% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionInteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionInteractorInterface.java index 24104973..f9051c97 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionInteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionInteractorInterface.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.presenter; +package com.remit.jmecustomer.features.termsandcondition.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionPresenterInterface.java similarity index 63% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionPresenterInterface.java index 6a6259f6..11add478 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionPresenterInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.presenter; +package com.remit.jmecustomer.features.termsandcondition.presenter; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionFragment; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionFragment; public interface TermsAndConditionPresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionViewModel.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionViewModel.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionViewModel.java index fc914218..81aefc77 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/presenter/TermsAndConditionViewModel.java @@ -1,18 +1,18 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.presenter; +package com.remit.jmecustomer.features.termsandcondition.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.termsandcondition.model.TermsDTO; -import com.swifttech.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionFragment; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.termsandcondition.model.TermsDTO; +import com.remit.jmecustomer.features.termsandcondition.view.TermsAndConditionFragment; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionAcitivity.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionAcitivity.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionAcitivity.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionAcitivity.java index e686e21b..b488b1c0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionAcitivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionAcitivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.view; +package com.remit.jmecustomer.features.termsandcondition.view; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -9,16 +9,16 @@ import android.content.Intent; import android.os.Bundle; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.features.termsandcondition.TermsAndConditionViewModelFactory; -import com.swifttech.remit.jmecustomer.features.termsandcondition.gateway.TermsAndConditionGateway; -import com.swifttech.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionPresenterInterface; -import com.swifttech.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionViewModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.termsandcondition.gateway.TermsAndConditionGateway; +import com.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionPresenterInterface; +import com.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.features.termsandcondition.TermsAndConditionViewModelFactory; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionFragment.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionFragment.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionFragment.java index 1b2cd7d9..526622c5 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/TermsAndConditionFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.view; +package com.remit.jmecustomer.features.termsandcondition.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -10,9 +10,9 @@ import android.widget.CheckBox; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionViewModel; +import com.remit.jmecustomer.features.termsandcondition.presenter.TermsAndConditionViewModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import com.jakewharton.rxbinding3.widget.RxCompoundButton; import butterknife.BindView; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/WebViewPDFFragment.java b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/WebViewPDFFragment.java similarity index 72% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/WebViewPDFFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/WebViewPDFFragment.java index ab144289..fac2b17a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/termsandcondition/view/WebViewPDFFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/termsandcondition/view/WebViewPDFFragment.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.termsandcondition.view; +package com.remit.jmecustomer.features.termsandcondition.view; import android.util.Log; import android.webkit.WebView; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.features.webbrowser.WebBrowserFragmentV2; public class WebViewPDFFragment extends WebBrowserFragmentV2 { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/RemitTransactionViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/RemitTransactionViewModelFactory.java similarity index 63% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/RemitTransactionViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/RemitTransactionViewModelFactory.java index bc15026d..f75513bb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/RemitTransactionViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/RemitTransactionViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory; +package com.remit.jmecustomer.features.transactionhistory; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.transactionhistory.gateway.TransactionHistoryV2Gateway; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2PresenterInterface; +import com.remit.jmecustomer.features.transactionhistory.gateway.TransactionHistoryV2Gateway; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2PresenterInterface; public class RemitTransactionViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/gateway/TransactionHistoryV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/gateway/TransactionHistoryV2Gateway.java similarity index 66% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/gateway/TransactionHistoryV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/gateway/TransactionHistoryV2Gateway.java index 15a5142d..187c4782 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/gateway/TransactionHistoryV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/gateway/TransactionHistoryV2Gateway.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.gateway; +package com.remit.jmecustomer.features.transactionhistory.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryAPIResponse; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryAPIResponse; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2InteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryAPIResponse; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryAPIResponse; +import com.remit.jmecustomer.utils.https.HttpClientV2; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryAPIResponse.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryAPIResponse.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryAPIResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryAPIResponse.java index 0f826858..a8d3a947 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryAPIResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryAPIResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.model; +package com.remit.jmecustomer.features.transactionhistory.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryItemModel.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryItemModel.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryItemModel.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryItemModel.java index 50ffb89f..3ea728c1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryItemModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalInboundTransactionHistoryItemModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.model; +package com.remit.jmecustomer.features.transactionhistory.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryAPIResponse.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryAPIResponse.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryAPIResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryAPIResponse.java index a33b618d..86270045 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryAPIResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryAPIResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.model; +package com.remit.jmecustomer.features.transactionhistory.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryItemModel.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryItemModel.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryItemModel.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryItemModel.java index 8ecc0b84..551543d6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryItemModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalOutboundTransactionHistoryItemModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.model; +package com.remit.jmecustomer.features.transactionhistory.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalTransactionHistoryDTO.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalTransactionHistoryDTO.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalTransactionHistoryDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalTransactionHistoryDTO.java index 06acf8d8..2c7d9083 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/model/InternationalTransactionHistoryDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/model/InternationalTransactionHistoryDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.model; +package com.remit.jmecustomer.features.transactionhistory.model; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2InteractorInterface.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2InteractorInterface.java index 34735cd0..56bac3b4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2InteractorInterface.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.presenter; +package com.remit.jmecustomer.features.transactionhistory.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryAPIResponse; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryAPIResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryAPIResponse; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryAPIResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2Presenter.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2Presenter.java index 254f29f5..20371cff 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2Presenter.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.presenter; +package com.remit.jmecustomer.features.transactionhistory.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2PresenterInterface.java similarity index 60% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2PresenterInterface.java index c75904db..40d010e2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/presenter/TransactionHistoryV2PresenterInterface.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.presenter; +package com.remit.jmecustomer.features.transactionhistory.presenter; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java similarity index 74% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java index e7549db8..57f08b7c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/RemitTransactionHistoryActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view; +package com.remit.jmecustomer.features.transactionhistory.view; import android.os.Bundle; import android.view.View; @@ -7,13 +7,13 @@ import android.widget.ImageView; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.transactionhistory.RemitTransactionViewModelFactory; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2PresenterInterface; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.InternationalTransactionHistoryContainerFragmentV2; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2PresenterInterface; +import com.remit.jmecustomer.features.transactionhistory.view.international.InternationalTransactionHistoryContainerFragmentV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.transactionhistory.RemitTransactionViewModelFactory; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/TransactionHistoryV2ActionListener.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/TransactionHistoryV2ActionListener.java similarity index 53% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/TransactionHistoryV2ActionListener.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/TransactionHistoryV2ActionListener.java index a5ee4e55..74140b9d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/TransactionHistoryV2ActionListener.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/TransactionHistoryV2ActionListener.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view; +package com.remit.jmecustomer.features.transactionhistory.view; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2PresenterInterface; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2PresenterInterface; /** * Created by Preyea diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java index 2669a6c2..6a7ef87f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view.international; +package com.remit.jmecustomer.features.transactionhistory.view.international; import android.os.Bundle; @@ -12,16 +12,16 @@ import android.view.View; import android.view.ViewGroup; import android.widget.EditText; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.inboundreceipt.view.InboundRemitReceiptActivity; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalInboundTransactionHistoryRVAdapter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalOutboundTransactionHistoryRVAdapter; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; +import com.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalInboundTransactionHistoryRVAdapter; +import com.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalOutboundTransactionHistoryRVAdapter; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.features.inboundreceipt.view.InboundRemitReceiptActivity; +import com.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalOutboundTransactionHistoryTypeFragmentV2.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalOutboundTransactionHistoryTypeFragmentV2.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalOutboundTransactionHistoryTypeFragmentV2.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalOutboundTransactionHistoryTypeFragmentV2.java index 3b87a040..5aae6d00 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalOutboundTransactionHistoryTypeFragmentV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalOutboundTransactionHistoryTypeFragmentV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view.international; +package com.remit.jmecustomer.features.transactionhistory.view.international; import android.os.Bundle; import androidx.annotation.NonNull; @@ -11,13 +11,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.EditText; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalOutboundTransactionHistoryRVAdapter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; +import com.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalOutboundTransactionHistoryRVAdapter; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.LineDividerItemDecoration; +import com.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalTransactionHistoryContainerFragmentV2.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalTransactionHistoryContainerFragmentV2.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalTransactionHistoryContainerFragmentV2.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalTransactionHistoryContainerFragmentV2.java index 032377aa..e19868d4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/InternationalTransactionHistoryContainerFragmentV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/InternationalTransactionHistoryContainerFragmentV2.java @@ -1,11 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view.international; +package com.remit.jmecustomer.features.transactionhistory.view.international; import android.content.Intent; import android.os.Bundle; import androidx.annotation.Nullable; -import com.swifttech.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; +import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter; +import com.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalOutboundTransactionHistoryRVAdapter; +import com.remit.jmecustomer.features.transactionhistory.view.international.adapter.TransactionHistoryViewPagerAdapter; +import com.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity; import com.google.android.material.tabs.TabLayout; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -18,14 +21,11 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; -import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2TransactionCompleteActivity; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter.InternationalOutboundTransactionHistoryRVAdapter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter.TransactionHistoryViewPagerAdapter; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.TextWatcherAdapter; +import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2TransactionCompleteActivity; +import com.remit.jmecustomer.utils.Utils; import com.tsongkha.spinnerdatepicker.DatePicker; import com.tsongkha.spinnerdatepicker.DateRangePickerDialog; import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java index 15b3c45e..657e87c9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/TransactionItemViewHolder.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view.international; +package com.remit.jmecustomer.features.transactionhistory.view.international; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java similarity index 85% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java index 34d00b33..d4428eb9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java @@ -1,15 +1,15 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter; +package com.remit.jmecustomer.features.transactionhistory.view.international.adapter; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.TransactionItemViewHolder; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryItemModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.transactionhistory.view.international.TransactionItemViewHolder; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java index 7d724e08..36038716 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/InternationalOutboundTransactionHistoryRVAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter; +package com.remit.jmecustomer.features.transactionhistory.view.international.adapter; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -6,10 +6,10 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; -import com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.TransactionItemViewHolder; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryItemModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.transactionhistory.view.international.TransactionItemViewHolder; +import com.remit.jmecustomer.utils.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/TransactionHistoryViewPagerAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/TransactionHistoryViewPagerAdapter.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/TransactionHistoryViewPagerAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/TransactionHistoryViewPagerAdapter.java index 2f1e6407..4b49ccda 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/transactionhistory/view/international/adapter/TransactionHistoryViewPagerAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/transactionhistory/view/international/adapter/TransactionHistoryViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.transactionhistory.view.international.adapter; +package com.remit.jmecustomer.features.transactionhistory.view.international.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/UserProfileViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/userprofile/UserProfileViewModelFactory.java similarity index 65% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/UserProfileViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/userprofile/UserProfileViewModelFactory.java index 8855522b..73ce7630 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/UserProfileViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/userprofile/UserProfileViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.userprofile; +package com.remit.jmecustomer.features.userprofile; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.userprofile.gateway.UserProfileGateway; -import com.swifttech.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterInterface; -import com.swifttech.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterV2; +import com.remit.jmecustomer.features.userprofile.gateway.UserProfileGateway; +import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterInterface; +import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterV2; public class UserProfileViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/gateway/UserProfileGateway.java b/app/src/main/java/com/remit/jmecustomer/features/userprofile/gateway/UserProfileGateway.java similarity index 76% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/gateway/UserProfileGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/userprofile/gateway/UserProfileGateway.java index df70c8a4..c91351cf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/gateway/UserProfileGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/userprofile/gateway/UserProfileGateway.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.userprofile.gateway; +package com.remit.jmecustomer.features.userprofile.gateway; import android.content.SharedPreferences; -import com.swifttech.remit.jmecustomer.RemitApplication; -import com.swifttech.remit.jmecustomer.base.PrefKeys; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.userprofile.model.UserProfile; -import com.swifttech.remit.jmecustomer.features.userprofile.presenter.UserProfileGatewayInterface; +import com.remit.jmecustomer.features.userprofile.presenter.UserProfileGatewayInterface; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.base.PrefKeys; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.features.userprofile.model.UserProfile; public class UserProfileGateway extends PrivilegedGateway implements UserProfileGatewayInterface { @Override diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/model/UserProfile.java b/app/src/main/java/com/remit/jmecustomer/features/userprofile/model/UserProfile.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/model/UserProfile.java rename to app/src/main/java/com/remit/jmecustomer/features/userprofile/model/UserProfile.java index a3307f72..f9a9ea58 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/model/UserProfile.java +++ b/app/src/main/java/com/remit/jmecustomer/features/userprofile/model/UserProfile.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.userprofile.model; +package com.remit.jmecustomer.features.userprofile.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java new file mode 100644 index 00000000..a03a01d1 --- /dev/null +++ b/app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java @@ -0,0 +1,9 @@ +package com.remit.jmecustomer.features.userprofile.presenter; + +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.userprofile.model.UserProfile; + +public interface UserProfileGatewayInterface extends PrivilegedGatewayInterface { + UserProfile getUserRelatedData(); + +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterInterface.java similarity index 58% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterInterface.java index dd648e48..ffbd4130 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.userprofile.presenter; +package com.remit.jmecustomer.features.userprofile.presenter; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.features.userprofile.model.UserProfile; +import com.remit.jmecustomer.features.userprofile.model.UserProfile; public interface UserProfilePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterV2.java b/app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterV2.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterV2.java rename to app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterV2.java index cee96346..17703cac 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/userprofile/presenter/UserProfilePresenterV2.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.userprofile.presenter; +package com.remit.jmecustomer.features.userprofile.presenter; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.features.userprofile.model.UserProfile; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.features.userprofile.model.UserProfile; public class UserProfilePresenterV2 extends BaseViewModel implements UserProfilePresenterInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java b/app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileActivity.java similarity index 80% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileActivity.java index 4e21bd2e..6ab420fc 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileActivity.java @@ -1,13 +1,14 @@ -package com.swifttech.remit.jmecustomer.features.userprofile.view; +package com.remit.jmecustomer.features.userprofile.view; import android.os.Bundle; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.userprofile.UserProfileViewModelFactory; -import com.swifttech.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterInterface; -import com.swifttech.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterV2; -import com.swifttech.remit.jmecustomer.utils.other.Utility; +import com.remit.jmecustomer.features.userprofile.model.UserProfile; +import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterInterface; +import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterV2; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.features.userprofile.UserProfileViewModelFactory; +import com.remit.jmecustomer.utils.other.Utility; import androidx.lifecycle.ViewModelProvider; @@ -15,9 +16,8 @@ import android.text.Html; import android.view.View; import android.widget.ImageView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.userprofile.model.UserProfile; -import com.swifttech.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.utils.Utils; import butterknife.BindView; import butterknife.ButterKnife; @@ -83,7 +83,7 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente // if(bankName!=null&&bankName.length()>0) // bankName=" - "+bankName; String gmeWalletNo=getString(R.string.jme_wallet_no_text); - tvWalletNumber.setText(Html.fromHtml(gmeWalletNo + " " + walletNumber + "")); + tvWalletNumber.setText(Html.fromHtml(gmeWalletNo + "
" + walletNumber + "")); } @@ -123,7 +123,11 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente referralCode=getString(R.string.na_text); String referralCodeTitle=getString(R.string.memberShipId_text); - tv_referral.setText(String.format("%s\n%s", referralCodeTitle, referralCode)); + +// tv_referral.setText(String.format("%s\n%s", referralCodeTitle, referralCode)); + tv_referral.setText(Html.fromHtml(referralCodeTitle + "
" + referralCode + "")); + + } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/adapter/WalletStatementRVAdapter.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/adapter/WalletStatementRVAdapter.java similarity index 90% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/adapter/WalletStatementRVAdapter.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/adapter/WalletStatementRVAdapter.java index f9907f1a..ccd434cf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/adapter/WalletStatementRVAdapter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/adapter/WalletStatementRVAdapter.java @@ -1,13 +1,13 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.adapter; +package com.remit.jmecustomer.features.walletstatement.adapter; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.walletstatement.model.WalletStatementV2ItemModel; -import com.swifttech.remit.jmecustomer.features.walletstatement.view.WalletStatementItemViewHolder; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.walletstatement.model.WalletStatementV2ItemModel; +import com.remit.jmecustomer.features.walletstatement.view.WalletStatementItemViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/gateway/WalletStatmentV2Gateway.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/gateway/WalletStatmentV2Gateway.java similarity index 81% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/gateway/WalletStatmentV2Gateway.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/gateway/WalletStatmentV2Gateway.java index 21463c1f..6130da57 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/gateway/WalletStatmentV2Gateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/gateway/WalletStatmentV2Gateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.gateway; +package com.remit.jmecustomer.features.walletstatement.gateway; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; -import com.swifttech.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; -import com.swifttech.remit.jmecustomer.features.walletstatement.presenter.WalletStatementV2InteractorInterface; +import com.remit.jmecustomer.features.walletstatement.presenter.WalletStatementV2InteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/model/WalletStatementV2APIResponse.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/model/WalletStatementV2APIResponse.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/model/WalletStatementV2APIResponse.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/model/WalletStatementV2APIResponse.java index 1829610b..c5c88c73 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/model/WalletStatementV2APIResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/model/WalletStatementV2APIResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.model; +package com.remit.jmecustomer.features.walletstatement.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/model/WalletStatementV2ItemModel.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/model/WalletStatementV2ItemModel.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/model/WalletStatementV2ItemModel.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/model/WalletStatementV2ItemModel.java index 9a404fa7..f7e61bdf 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/model/WalletStatementV2ItemModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/model/WalletStatementV2ItemModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.model; +package com.remit.jmecustomer.features.walletstatement.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2InteractorInterface.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2InteractorInterface.java similarity index 52% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2InteractorInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2InteractorInterface.java index 921fd034..9500cbaa 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2InteractorInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2InteractorInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.presenter; +package com.remit.jmecustomer.features.walletstatement.presenter; -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; +import com.remit.jmecustomer.base.BaseInteractorInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2Presenter.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2Presenter.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2Presenter.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2Presenter.java index 414535ca..86c4f2c6 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2Presenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2Presenter.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.presenter; - -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BasePresenter; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse; -import com.swifttech.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; +package com.remit.jmecustomer.features.walletstatement.presenter; + +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BasePresenter; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponse; +import com.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2PresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2PresenterInterface.java similarity index 55% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2PresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2PresenterInterface.java index 131c2af5..521168ef 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2PresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/presenter/WalletStatementV2PresenterInterface.java @@ -1,8 +1,8 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.presenter; +package com.remit.jmecustomer.features.walletstatement.presenter; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.walletstatement.model.WalletStatementV2ItemModel; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.walletstatement.model.WalletStatementV2ItemModel; import java.util.List; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java similarity index 87% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java index a5453b47..913ea8ce 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/view/WalletStatementItemViewHolder.java @@ -1,11 +1,11 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.view; +package com.remit.jmecustomer.features.walletstatement.view; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/view/WalletStatementV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/view/WalletStatementV2Activity.java similarity index 88% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/view/WalletStatementV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/walletstatement/view/WalletStatementV2Activity.java index 6277a11a..41f2fc3c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/walletstatement/view/WalletStatementV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/walletstatement/view/WalletStatementV2Activity.java @@ -1,18 +1,18 @@ -package com.swifttech.remit.jmecustomer.features.walletstatement.view; +package com.remit.jmecustomer.features.walletstatement.view; import android.os.Bundle; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.features.walletstatement.adapter.WalletStatementRVAdapter; -import com.swifttech.remit.jmecustomer.features.walletstatement.gateway.WalletStatmentV2Gateway; -import com.swifttech.remit.jmecustomer.features.walletstatement.model.WalletStatementV2ItemModel; -import com.swifttech.remit.jmecustomer.features.walletstatement.presenter.WalletStatementV2Presenter; -import com.swifttech.remit.jmecustomer.features.walletstatement.presenter.WalletStatementV2PresenterInterface; +import com.remit.jmecustomer.features.walletstatement.adapter.WalletStatementRVAdapter; +import com.remit.jmecustomer.features.walletstatement.gateway.WalletStatmentV2Gateway; +import com.remit.jmecustomer.features.walletstatement.model.WalletStatementV2ItemModel; +import com.remit.jmecustomer.features.walletstatement.presenter.WalletStatementV2Presenter; +import com.remit.jmecustomer.features.walletstatement.presenter.WalletStatementV2PresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.utils.Utils; import com.tsongkha.spinnerdatepicker.DatePicker; import com.tsongkha.spinnerdatepicker.DateRangePickerDialog; import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java rename to app/src/main/java/com/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java index 1ed93823..a1770660 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java +++ b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/WebBrowserFragmentV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.webbrowser; +package com.remit.jmecustomer.features.webbrowser; import android.Manifest; import android.annotation.SuppressLint; @@ -32,12 +32,12 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatCheckBox; import androidx.core.widget.NestedScrollView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeButton; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.utils.https.HTTPConstants; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.common.customwidgets.GmeButton; +import com.remit.jmecustomer.utils.https.HTTPConstants; import com.tbruyelle.rxpermissions2.RxPermissions; import butterknife.BindView; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java rename to app/src/main/java/com/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java index d70d1048..07089eff 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/WebBrowserV2Activity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.webbrowser; +package com.remit.jmecustomer.features.webbrowser; import android.Manifest; import android.animation.Animator; @@ -31,13 +31,13 @@ import android.widget.ProgressBar; import androidx.appcompat.widget.AppCompatCheckBox; import androidx.core.widget.NestedScrollView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.common.customwidgets.GmeButton; -import com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView; -import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.utils.https.HTTPConstants; +import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.common.customwidgets.GmeButton; +import com.remit.jmecustomer.common.customwidgets.JmeTextView; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.utils.https.HTTPConstants; import com.tbruyelle.rxpermissions2.RxPermissions; import butterknife.BindView; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/model/KeyValueData.java b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/model/KeyValueData.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/model/KeyValueData.java rename to app/src/main/java/com/remit/jmecustomer/features/webbrowser/model/KeyValueData.java index 2a264978..73f17bd8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/model/KeyValueData.java +++ b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/model/KeyValueData.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.webbrowser.model; +package com.remit.jmecustomer.features.webbrowser.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/model/WebRequestModel.java b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/model/WebRequestModel.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/model/WebRequestModel.java rename to app/src/main/java/com/remit/jmecustomer/features/webbrowser/model/WebRequestModel.java index 0166c91f..7bd46319 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/webbrowser/model/WebRequestModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/webbrowser/model/WebRequestModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.webbrowser.model; +package com.remit.jmecustomer.features.webbrowser.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/WithdrawViewModelFactory.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/WithdrawViewModelFactory.java similarity index 65% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/WithdrawViewModelFactory.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/WithdrawViewModelFactory.java index e28999a2..e76f772d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/WithdrawViewModelFactory.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/WithdrawViewModelFactory.java @@ -1,12 +1,12 @@ -package com.swifttech.remit.jmecustomer.features.withdraw; +package com.remit.jmecustomer.features.withdraw; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.features.withdraw.gateway.WithdrawGateway; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; +import com.remit.jmecustomer.features.withdraw.gateway.WithdrawGateway; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; public class WithdrawViewModelFactory implements ViewModelProvider.Factory { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/gateway/WithdrawGateway.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/gateway/WithdrawGateway.java similarity index 78% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/gateway/WithdrawGateway.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/gateway/WithdrawGateway.java index 3c174695..5ac3000b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/gateway/WithdrawGateway.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/gateway/WithdrawGateway.java @@ -1,9 +1,9 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.gateway; +package com.remit.jmecustomer.features.withdraw.gateway; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawGatewayInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGateway; +import com.remit.jmecustomer.utils.https.HttpClientV2; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/model/WithdrawStatusResponseDTO.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/model/WithdrawStatusResponseDTO.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/model/WithdrawStatusResponseDTO.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/model/WithdrawStatusResponseDTO.java index 94b4bec0..3b86a976 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/model/WithdrawStatusResponseDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/model/WithdrawStatusResponseDTO.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.model; +package com.remit.jmecustomer.features.withdraw.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawGatewayInterface.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawGatewayInterface.java similarity index 72% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawGatewayInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawGatewayInterface.java index a26af156..9fb4996d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawGatewayInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawGatewayInterface.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.presenter; +package com.remit.jmecustomer.features.withdraw.presenter; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; +import com.remit.jmecustomer.base.PrivilegedGatewayInterface; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenter.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenter.java similarity index 89% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenter.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenter.java index 919f2f9e..be781090 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenter.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenter.java @@ -1,22 +1,22 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.presenter; +package com.remit.jmecustomer.features.withdraw.presenter; import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.google.gson.reflect.TypeToken; -import com.swifttech.remit.jmecustomer.base.BaseViewModel; -import com.swifttech.remit.jmecustomer.common.customwidgets.CustomAlertDialog; -import com.swifttech.remit.jmecustomer.features.security.RemitAuthManager; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthFailedResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; -import com.swifttech.remit.jmecustomer.features.security.model.RemitTxnParam; -import com.swifttech.remit.jmecustomer.features.withdraw.model.WithdrawStatusResponseDTO; -import com.swifttech.remit.jmecustomer.utils.Constants; -import com.swifttech.remit.jmecustomer.utils.Utils; -import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; -import com.swifttech.remit.jmecustomer.utils.https.GenericResponseDataModel; -import com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel; +import com.remit.jmecustomer.base.BaseViewModel; +import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog; +import com.remit.jmecustomer.features.security.RemitAuthManager; +import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult; +import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult; +import com.remit.jmecustomer.features.security.model.RemitTxnParam; +import com.remit.jmecustomer.features.withdraw.model.WithdrawStatusResponseDTO; +import com.remit.jmecustomer.utils.Constants; +import com.remit.jmecustomer.utils.Utils; +import com.remit.jmecustomer.utils.https.GenericApiObserverResponseV2; +import com.remit.jmecustomer.utils.https.GenericResponseDataModel; +import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenterInterface.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenterInterface.java similarity index 63% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenterInterface.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenterInterface.java index 8e72d9c4..e71bb9fb 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenterInterface.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/presenter/WithdrawPresenterInterface.java @@ -1,10 +1,10 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.presenter; +package com.remit.jmecustomer.features.withdraw.presenter; import androidx.lifecycle.LiveData; -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; -import com.swifttech.remit.jmecustomer.features.withdraw.model.WithdrawStatusResponseDTO; +import com.remit.jmecustomer.base.BaseContractInterface; +import com.remit.jmecustomer.base.BasePresenterInterface; +import com.remit.jmecustomer.features.withdraw.model.WithdrawStatusResponseDTO; import io.reactivex.Observable; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java index 63cb19bd..5e89b31d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawActivity.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.view; +package com.remit.jmecustomer.features.withdraw.view; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -8,12 +8,12 @@ import android.os.Bundle; import android.view.View; import android.widget.TextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseActivity; -import com.swifttech.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; -import com.swifttech.remit.jmecustomer.features.withdraw.WithdrawViewModelFactory; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseActivity; +import com.remit.jmecustomer.common.customwidgets.GenericViewPagerAdapter; +import com.remit.jmecustomer.features.withdraw.WithdrawViewModelFactory; import java.util.ArrayList; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawAmountInputFragment.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawAmountInputFragment.java similarity index 84% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawAmountInputFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawAmountInputFragment.java index 2d64a6fc..d531333e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawAmountInputFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawAmountInputFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.view; +package com.remit.jmecustomer.features.withdraw.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,10 +12,10 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.jakewharton.rxbinding3.widget.RxTextView; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawTransactionReviewFragment.java b/app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawTransactionReviewFragment.java similarity index 82% rename from app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawTransactionReviewFragment.java rename to app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawTransactionReviewFragment.java index 5dbf8e07..8b19e4c9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/withdraw/view/WithdrawTransactionReviewFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/withdraw/view/WithdrawTransactionReviewFragment.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.features.withdraw.view; +package com.remit.jmecustomer.features.withdraw.view; import android.os.Bundle; import android.view.LayoutInflater; @@ -10,11 +10,11 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.base.BaseFragment; -import com.swifttech.remit.jmecustomer.features.withdraw.model.WithdrawStatusResponseDTO; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; -import com.swifttech.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; +import com.remit.jmecustomer.features.withdraw.model.WithdrawStatusResponseDTO; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenter; +import com.remit.jmecustomer.features.withdraw.presenter.WithdrawPresenterInterface; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.base.BaseFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/services/JMEFcmMessagingService.java b/app/src/main/java/com/remit/jmecustomer/services/JMEFcmMessagingService.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/services/JMEFcmMessagingService.java rename to app/src/main/java/com/remit/jmecustomer/services/JMEFcmMessagingService.java index b322d2a1..6d25e4a9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/services/JMEFcmMessagingService.java +++ b/app/src/main/java/com/remit/jmecustomer/services/JMEFcmMessagingService.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.services; +package com.remit.jmecustomer.services; import android.app.Notification; import android.app.NotificationChannel; @@ -13,8 +13,8 @@ import androidx.core.content.ContextCompat; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; -import com.swifttech.remit.jmecustomer.R; -import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2; +import com.remit.jmecustomer.R; +import com.remit.jmecustomer.features.home.view.HomeActivityV2; import java.util.Map; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java b/app/src/main/java/com/remit/jmecustomer/utils/Constants.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java rename to app/src/main/java/com/remit/jmecustomer/utils/Constants.java index 62cdee20..b4746299 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/Constants.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils; +package com.remit.jmecustomer.utils; import android.os.Build; import android.security.keystore.KeyProperties; @@ -95,5 +95,6 @@ public class Constants { public static final String BIOMETRIC_ERROR_NONE_ENROLLED = "BIOMETRIC_ERROR_NONE_ENROLLED"; public static final String BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED = "BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED"; public static final String FINGER_PRINT = "FINGER_PRINT"; + public static final String FINGER_PRINT_DELIMETER = "=LOVEJME="; } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/ImageUtils.java b/app/src/main/java/com/remit/jmecustomer/utils/ImageUtils.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/ImageUtils.java rename to app/src/main/java/com/remit/jmecustomer/utils/ImageUtils.java index a5e3ec70..f850b165 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/ImageUtils.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/ImageUtils.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils; +package com.remit.jmecustomer.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/RxUtils.java b/app/src/main/java/com/remit/jmecustomer/utils/RxUtils.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/RxUtils.java rename to app/src/main/java/com/remit/jmecustomer/utils/RxUtils.java index 09aefeec..ad24515c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/RxUtils.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/RxUtils.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils; +package com.remit.jmecustomer.utils; import android.Manifest; import android.content.Context; @@ -8,7 +8,7 @@ import android.util.Log; import androidx.fragment.app.FragmentActivity; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import com.google.android.gms.location.LocationRequest; import com.patloew.rxlocation.RxLocation; import com.tbruyelle.rxpermissions2.RxPermissions; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Utils.java b/app/src/main/java/com/remit/jmecustomer/utils/Utils.java similarity index 93% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/Utils.java rename to app/src/main/java/com/remit/jmecustomer/utils/Utils.java index 2a0445d5..c19f1a77 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Utils.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/Utils.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils; +package com.remit.jmecustomer.utils; import android.content.Context; import android.content.pm.PackageManager; @@ -7,8 +7,6 @@ import android.graphics.Color; import android.os.Build; import android.os.Environment; import android.provider.Settings; -import android.security.keystore.KeyGenParameterSpec; -import android.security.keystore.KeyProperties; import android.util.Base64; import android.util.Log; import android.view.LayoutInflater; @@ -19,7 +17,6 @@ import android.view.animation.Transformation; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.RequiresApi; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; @@ -32,19 +29,16 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import java.io.File; import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.net.NetworkInterface; -import java.security.Key; -import java.security.KeyStore; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Arrays; import java.util.Calendar; import java.util.Collections; import java.util.Date; @@ -54,24 +48,9 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.crypto.Cipher; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; - -import kotlin.Unit; - -import static com.swifttech.remit.jmecustomer.utils.Constants.ALGORITHM; -import static com.swifttech.remit.jmecustomer.utils.Constants.BLOCK_MODE; -import static com.swifttech.remit.jmecustomer.utils.Constants.INTERNET; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEYS_TORE; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEY_DEFAULT_NAME; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEY_LOGIN_CREDENTIALS_NAME; -import static com.swifttech.remit.jmecustomer.utils.Constants.KEY_PIN_NAME; -import static com.swifttech.remit.jmecustomer.utils.Constants.LOGIN; -import static com.swifttech.remit.jmecustomer.utils.Constants.OTHER_ERROR; -import static com.swifttech.remit.jmecustomer.utils.Constants.PADDING; -import static com.swifttech.remit.jmecustomer.utils.Constants.PIN; -import static com.swifttech.remit.jmecustomer.utils.Constants.SERVER_ERROR; +import static com.remit.jmecustomer.utils.Constants.INTERNET; +import static com.remit.jmecustomer.utils.Constants.OTHER_ERROR; +import static com.remit.jmecustomer.utils.Constants.SERVER_ERROR; /** * Created by frantic on 12/8/17. diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/APIRequestErrorReturn.java b/app/src/main/java/com/remit/jmecustomer/utils/https/APIRequestErrorReturn.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/APIRequestErrorReturn.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/APIRequestErrorReturn.java index c36cd629..69e002d1 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/APIRequestErrorReturn.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/APIRequestErrorReturn.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java b/app/src/main/java/com/remit/jmecustomer/utils/https/API_URL.java similarity index 99% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/API_URL.java index 8a72baf9..2aff6951 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/API_URL.java @@ -1,7 +1,7 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; -import com.swifttech.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.BuildConfig; public class API_URL { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java b/app/src/main/java/com/remit/jmecustomer/utils/https/ApiEndpoints.java similarity index 86% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/ApiEndpoints.java index 000192c3..66e7828a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/ApiEndpoints.java @@ -1,30 +1,30 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import com.google.gson.JsonObject; -import com.swifttech.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; -import com.swifttech.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; -import com.swifttech.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; -import com.swifttech.remit.jmecustomer.features.home.model.UserInfoV2DataApiResponse; -import com.swifttech.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; -import com.swifttech.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; -import com.swifttech.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; -import com.swifttech.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.ExRateAPIRequestBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; -import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; -import com.swifttech.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryAPIResponse; -import com.swifttech.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryAPIResponse; -import com.swifttech.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; +import com.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; +import com.remit.jmecustomer.features.changepassword.model.ChangePasswordActivityV2APIResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.ExchangeCalculationApiResponse; +import com.remit.jmecustomer.features.exrate.model.datav2.PaymentServiceApiResponse; +import com.remit.jmecustomer.features.home.model.UserInfoV2DataApiResponse; +import com.remit.jmecustomer.features.login.model.LoginV2DataApiResponse; +import com.remit.jmecustomer.features.recipientlisting.model.recipientlisting.ReceiverInfoModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model; +import com.remit.jmecustomer.features.registerv2.existingcustomer.model.ExistingRegisterApiResponse; +import com.remit.jmecustomer.features.registerv2.newcustomer.model.NewRegisterApiResponse; +import com.remit.jmecustomer.features.resetpassword.model.ResetApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.ExRateAPIRequestBody; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyAPIRequestBody; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionCompleteV2ResponseBody; +import com.remit.jmecustomer.features.sendmoney.model.SendMoneyTransactionResponseBody; +import com.remit.jmecustomer.features.sendmoney.model.amountdetail.BranchListApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse; +import com.remit.jmecustomer.features.sendmoney.model.payoutmode.PayoutModeApiResponse; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; +import com.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; +import com.remit.jmecustomer.features.support.model.SupportActivityV2APIResponse; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalInboundTransactionHistoryAPIResponse; +import com.remit.jmecustomer.features.transactionhistory.model.InternationalOutboundTransactionHistoryAPIResponse; +import com.remit.jmecustomer.features.walletstatement.model.WalletStatementV2APIResponse; import java.util.Map; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiObserverResponse.java b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiObserverResponse.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiObserverResponse.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiObserverResponse.java index f82bdc79..83392f52 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiObserverResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiObserverResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import java.io.IOException; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiObserverResponseV2.java b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiObserverResponseV2.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiObserverResponseV2.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiObserverResponseV2.java index d2ec3b84..f2afa523 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiObserverResponseV2.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiObserverResponseV2.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import com.google.gson.reflect.TypeToken; @@ -32,7 +32,7 @@ public abstract class GenericApiObserverResponseV2 extends DisposableObserver * Since Java doesn't support Higher-Kind Generics Type as Type-Erasure occurs during compile time. * So workaround is to supply type during runtime withCountdownTimer help of reflection. * Any sub class should override this method and provide corresponding type. - * By default, {@link com.swifttech.remit.jmecustomer.utils.https.MessageResponseDataModel} type is used by the base class. + * By default, {@link MessageResponseDataModel} type is used by the base class. * Detail Explanation on Higher-Kind Generics Type, See *

    *
  • Stackoverflow : Why is second level generics not possible in Java
    • diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiResponse.java b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiResponse.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiResponse.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiResponse.java index 0d0f479a..c1be6012 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericApiResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericApiResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import retrofit2.Call; import retrofit2.Callback; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericResponseDataModel.java b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericResponseDataModel.java similarity index 96% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericResponseDataModel.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/GenericResponseDataModel.java index abf0cf23..7a2e0af0 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericResponseDataModel.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericResponseDataModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericThrowable.java b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericThrowable.java similarity index 70% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericThrowable.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/GenericThrowable.java index 79f68576..c6620436 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/GenericThrowable.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/GenericThrowable.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; public class GenericThrowable extends Throwable { public GenericThrowable(String message) { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HTTPConstants.java b/app/src/main/java/com/remit/jmecustomer/utils/https/HTTPConstants.java similarity index 95% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HTTPConstants.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/HTTPConstants.java index abbe61fd..d6f1aca3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HTTPConstants.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/HTTPConstants.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; public class HTTPConstants { public static final String HTTP_RESPONSE_401 = "You have logged in from another device."; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HttpClientV2.java b/app/src/main/java/com/remit/jmecustomer/utils/https/HttpClientV2.java similarity index 94% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HttpClientV2.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/HttpClientV2.java index cab2a969..bd5f9387 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HttpClientV2.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/HttpClientV2.java @@ -1,11 +1,9 @@ -package com.swifttech.remit.jmecustomer.utils.https; - -import android.content.Context; +package com.remit.jmecustomer.utils.https; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.swifttech.remit.jmecustomer.BuildConfig; -import com.swifttech.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.BuildConfig; +import com.remit.jmecustomer.RemitApplication; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/MessageResponseDataModel.java b/app/src/main/java/com/remit/jmecustomer/utils/https/MessageResponseDataModel.java similarity index 91% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/MessageResponseDataModel.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/MessageResponseDataModel.java index 544ba5c8..b443a22e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/MessageResponseDataModel.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/MessageResponseDataModel.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/RestApi.java b/app/src/main/java/com/remit/jmecustomer/utils/https/RestApi.java similarity index 75% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/RestApi.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/RestApi.java index 71a1cf86..a298f836 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/RestApi.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/RestApi.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; /** diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/SessionExpiredException.java b/app/src/main/java/com/remit/jmecustomer/utils/https/SessionExpiredException.java similarity index 73% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/SessionExpiredException.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/SessionExpiredException.java index e7acf5a9..21af6afd 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/SessionExpiredException.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/SessionExpiredException.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; public class SessionExpiredException extends Exception { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/UserSessionObserverResponse.java b/app/src/main/java/com/remit/jmecustomer/utils/https/UserSessionObserverResponse.java similarity index 97% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/UserSessionObserverResponse.java rename to app/src/main/java/com/remit/jmecustomer/utils/https/UserSessionObserverResponse.java index 915ccaff..16a19e71 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/UserSessionObserverResponse.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/https/UserSessionObserverResponse.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.https; +package com.remit.jmecustomer.utils.https; import org.json.JSONObject; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/other/Utility.java b/app/src/main/java/com/remit/jmecustomer/utils/other/Utility.java similarity index 98% rename from app/src/main/java/com/swifttech/remit/jmecustomer/utils/other/Utility.java rename to app/src/main/java/com/remit/jmecustomer/utils/other/Utility.java index c2e75456..94145070 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/other/Utility.java +++ b/app/src/main/java/com/remit/jmecustomer/utils/other/Utility.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer.utils.other; +package com.remit.jmecustomer.utils.other; import android.content.ContentResolver; import android.content.Context; @@ -15,7 +15,7 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.swifttech.remit.jmecustomer.R; +import com.remit.jmecustomer.R; import java.io.File; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseGatewayInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseGatewayInterface.java deleted file mode 100644 index 6b703a23..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/base/BaseGatewayInterface.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.swifttech.remit.jmecustomer.base; - -public interface BaseGatewayInterface { -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java deleted file mode 100644 index 4312a4e5..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/aboutscreen/viewModel/AboutUsInteractorInterface.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.aboutscreen.viewModel; - -public interface AboutUsInteractorInterface { -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java deleted file mode 100644 index c88aade1..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCAdditionalIDTypeFragment.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.kyc.existingCustomer.view.documents; - -import com.swifttech.remit.jmecustomer.base.BaseFragment; - -public class ExistingKYCAdditionalIDTypeFragment extends BaseFragment { - - - - - -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java deleted file mode 100644 index 06bf0e16..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recepientTermsConditions/RecipientPresenterTermsInterface.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recepientTermsConditions; - -import com.swifttech.remit.jmecustomer.base.BasePresenterInterface; - -public interface RecipientPresenterTermsInterface extends BasePresenterInterface { - - void verifyEmailCode(String emailCode); - - void requestForOtp(); - - - -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java deleted file mode 100644 index 65fafd1c..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3PresenterInterface.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.edit; - -import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.recipientaddeditV3.RecipientPresenterInterface; - -public interface RecipientEditV3PresenterInterface extends RecipientPresenterInterface { - -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java deleted file mode 100644 index 95d676f1..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recepientTermsConditions/RecipientTermsContractInterface.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions; - -import com.swifttech.remit.jmecustomer.base.BaseContractInterface; - -public interface RecipientTermsContractInterface extends BaseContractInterface { - void showEmailCodePromptDialog(); - - void onEmailVerifySuccess(); -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java deleted file mode 100644 index 02303c8b..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/renewId/presenter/RenewIdViewLiveData.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.renewId.presenter; - -class RenewIdViewLiveData { -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java deleted file mode 100644 index 4aeca983..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/FingerPrintSetUpGateway.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.settings.gateway; - -import com.swifttech.remit.jmecustomer.base.PrivilegedGateway; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; -import com.swifttech.remit.jmecustomer.features.settings.viewModel.FingerPrintSetupInteractorInterface; -import com.swifttech.remit.jmecustomer.utils.https.HttpClientV2; - -import io.reactivex.Observable; - -public class FingerPrintSetUpGateway extends PrivilegedGateway implements FingerPrintSetupInteractorInterface.FingerPrintSetupGatewayInterface { - @Override - public Observable getTokenFromPassword(String auth, FingerPrintSetupRequestModel fingerPrintSetupRequestModel) { - return HttpClientV2.getInstance().getTokenFromPassword(auth, fingerPrintSetupRequestModel); - } -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java deleted file mode 100644 index c063b658..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/viewModel/FingerPrintSetupInteractorInterface.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.settings.viewModel; - -import com.swifttech.remit.jmecustomer.base.BaseInteractorInterface; -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.changepassNPin.model.ChangePassNPInResponse; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupRequestModel; -import com.swifttech.remit.jmecustomer.features.settings.model.FingerPrintSetupResponse; - -import io.reactivex.Observable; - -public interface FingerPrintSetupInteractorInterface extends BaseInteractorInterface { - interface FingerPrintSetupGatewayInterface extends PrivilegedGatewayInterface - { - Observable getTokenFromPassword( - String auth, - FingerPrintSetupRequestModel fingerPrintSetupRequestModel - ); - } -} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java deleted file mode 100644 index 3bc82b88..00000000 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/presenter/UserProfileGatewayInterface.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.swifttech.remit.jmecustomer.features.userprofile.presenter; - -import com.swifttech.remit.jmecustomer.base.PrivilegedGatewayInterface; -import com.swifttech.remit.jmecustomer.features.userprofile.model.UserProfile; - -public interface UserProfileGatewayInterface extends PrivilegedGatewayInterface { - UserProfile getUserRelatedData(); - -} diff --git a/app/src/main/res/layout/activity_about_jme.xml b/app/src/main/res/layout/activity_about_jme.xml index 4e6a22f3..fade83c1 100644 --- a/app/src/main/res/layout/activity_about_jme.xml +++ b/app/src/main/res/layout/activity_about_jme.xml @@ -18,7 +18,7 @@ android:contentDescription="@string/app_name" android:padding="10dp" app:srcCompat="@drawable/icv_back" - android:tint="@color/white" /> + app:tint="@color/white" /> - - - + - - - - - - - - - - + - + app:layout_behavior="com.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior"> + app:layout_behavior="com.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior"> - - - - + - - - + - - - + - - - + - - - + - - - + - - - - + - - - + - - - + - - - - + - - - + - - - + - - - - - - - - - - - - - - + tools:context="com.remit.jmecustomer.features.settings.view.FingerprintEnablePromptActivity"> - - - - - + tools:context="com.remit.jmecustomer.home.view.HomeActivity"> - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_behavior="com.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior"> - diff --git a/app/src/main/res/layout/activity_kyc_v3.xml b/app/src/main/res/layout/activity_kyc_v3.xml index fcc1bec5..e899fde0 100644 --- a/app/src/main/res/layout/activity_kyc_v3.xml +++ b/app/src/main/res/layout/activity_kyc_v3.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/white" - app:layout_behavior="com.swifttech.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior"> + app:layout_behavior="com.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior"> - diff --git a/app/src/main/res/layout/activity_login_v2.xml b/app/src/main/res/layout/activity_login_v2.xml index 84191a05..7ec41e54 100644 --- a/app/src/main/res/layout/activity_login_v2.xml +++ b/app/src/main/res/layout/activity_login_v2.xml @@ -21,7 +21,7 @@ android:orientation="vertical" > - - - - + - - - + - - - - - - - - - - - - - - - @@ -217,9 +219,10 @@ android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:paddingBottom="10dp" + android:visibility="gone" android:background="@drawable/ic_rectangle_white_extra_corners"> - - - - diff --git a/app/src/main/res/layout/activity_recipient_add_edit_v3.xml b/app/src/main/res/layout/activity_recipient_add_edit_v3.xml index 01a86002..114ffbd9 100644 --- a/app/src/main/res/layout/activity_recipient_add_edit_v3.xml +++ b/app/src/main/res/layout/activity_recipient_add_edit_v3.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:fillViewport="true" > - diff --git a/app/src/main/res/layout/activity_recipient_listing_v3.xml b/app/src/main/res/layout/activity_recipient_listing_v3.xml index 7b838899..467bec47 100644 --- a/app/src/main/res/layout/activity_recipient_listing_v3.xml +++ b/app/src/main/res/layout/activity_recipient_listing_v3.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/white" - app:layout_behavior="com.swifttech.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior"> + app:layout_behavior="com.remit.jmecustomer.common.customwidgets.CustomAppBarLayoutBehavior"> - - - - - - - - - - + - - - - - + - - + - - - + - - - + @@ -156,7 +157,7 @@ - - - - - - + - - - - - - - - - - - - - - - - + - - - + - - - - + tools:context="com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity"> - - - - - - - - - @@ -250,7 +250,7 @@ android:orientation="horizontal" android:weightSum="1"> - - @@ -276,7 +276,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - @@ -304,7 +304,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - @@ -331,7 +331,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - @@ -362,7 +362,7 @@ android:layout_height="wrap_content" android:visibility="gone"> - - @@ -392,7 +392,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - @@ -420,7 +420,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - @@ -447,7 +447,7 @@ android:layout_height="wrap_content" android:visibility="gone"> - - - - @@ -503,7 +503,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - - - - - - - - - - - - - - - - @@ -397,7 +397,7 @@ tools:layout_conversion_absoluteWidth="1dp" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + - - + android:orientation="vertical"> + android:layout_gravity="center" + android:layout_margin="@dimen/_10sdp" + android:visibility="gone" + app:srcCompat="@drawable/ic_auto_debit_renew" /> - - @@ -50,32 +48,31 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - + + + android:textSize="@dimen/_13sdp" /> - - diff --git a/app/src/main/res/layout/dialog_generic_prompt_single_button.xml b/app/src/main/res/layout/dialog_generic_prompt_single_button.xml new file mode 100644 index 00000000..ec2aabb5 --- /dev/null +++ b/app/src/main/res/layout/dialog_generic_prompt_single_button.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_generic_text_listing_layout.xml b/app/src/main/res/layout/dialog_generic_text_listing_layout.xml index d41e8585..8c3a9807 100644 --- a/app/src/main/res/layout/dialog_generic_text_listing_layout.xml +++ b/app/src/main/res/layout/dialog_generic_text_listing_layout.xml @@ -10,14 +10,14 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - + > diff --git a/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml b/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml index fdc8d2be..6d0d2c63 100644 --- a/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml +++ b/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml @@ -32,7 +32,7 @@ android:background="@drawable/curve_rectangle_bright_grey" android:padding="@dimen/_10sdp" > - - - - - - - - - - - - - - + - - @@ -22,7 +22,7 @@ android:orientation="horizontal" android:paddingTop="@dimen/_8sdp"> - - - - - - - - + - - - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - - - - + - - - + - - - + - - - + - - - + - - - + - - - + app:maxLengthLimiter="50" /> + - - - + app:maxLengthLimiter="50" /> + - - + - app:maxLengthLimiter="100" /> - - - - - + app:maxLengthLimiter="60" /> + - - - + app:maxLengthLimiter="60" /> + - - - + app:maxLengthLimiter="60" /> + - - - + app:maxLengthLimiter="60" /> + - - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - - - - - - - - - - + - - - + - - + - - - - - - + - - - + - - - + - - - + - - - + - - - + - - - - - + - - - + - - - + - - - + - - - + @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - - + - - - + - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml b/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml index 6b4d73d0..d8885781 100644 --- a/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml +++ b/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml @@ -43,7 +43,7 @@ android:background="@drawable/ic_search_icon" android:contentDescription="@string/searchIcon_text" /> - - - + diff --git a/app/src/main/res/layout/fragment_kyc_customer_detail.xml b/app/src/main/res/layout/fragment_kyc_customer_detail.xml index 62e0562c..82e0afc4 100644 --- a/app/src/main/res/layout/fragment_kyc_customer_detail.xml +++ b/app/src/main/res/layout/fragment_kyc_customer_detail.xml @@ -25,7 +25,7 @@ android:orientation="vertical" android:padding="@dimen/_8sdp"> - - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/fragment_search_cash_pickup_txn.xml b/app/src/main/res/layout/fragment_search_cash_pickup_txn.xml index c196a1a5..004673f6 100644 --- a/app/src/main/res/layout/fragment_search_cash_pickup_txn.xml +++ b/app/src/main/res/layout/fragment_search_cash_pickup_txn.xml @@ -15,14 +15,14 @@ > - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - + - @@ -27,7 +27,7 @@ app:layout_constraintVertical_chainStyle="packed" tools:srcCompat="@drawable/icv_menu_sendmoney" /> - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_tran_history2.xml b/app/src/main/res/layout/tab_tran_history2.xml index fe9e03b0..7ce9c9e7 100644 --- a/app/src/main/res/layout/tab_tran_history2.xml +++ b/app/src/main/res/layout/tab_tran_history2.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar_generic_with_cs.xml b/app/src/main/res/layout/toolbar_generic_with_cs.xml index 117d7f96..67d3370e 100644 --- a/app/src/main/res/layout/toolbar_generic_with_cs.xml +++ b/app/src/main/res/layout/toolbar_generic_with_cs.xml @@ -16,7 +16,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - শর্তাবলী সংশ্লিষ্ট শর্তাবলী পাওয়া যায়নি দয়া করে শর্তাবলী গুলো গ্রহণ করুণ - বিদেশের রেমিটেন্স এবং গার্হস্থ্য রেমিটেন্সগুলি সহজেই প্রকাশের জন্য জাপানের অর্থ ব্যবহার করার জন্য আপনার অ্যাকাউন্ট থেকে অর্থ উত্তোলনের জন্য আপনাকে সম্মত হতে হবে। উত্তলোন লেনদেন ওপেন ব্যাংকিংয়ের মাধ্যমে করা হবে। বিদেশী রেমিট্যান্স এবং গার্হস্থ্য রেমিটেন্সের মতো পরিষেবাগুলি ব্যবহার করার সময় আপনি যে অ্যাকাউন্টটি প্রত্যাহার করতে সম্মত হন ব্যক্তিগত তথ্য চিকিত্সা নীতি ব্যক্তিগত তথ্য সংগ্রহ এবং ব্যবহারের চুক্তি - আইনটির অবৈধ আচরণ ও অবৈধ আচরণের জন্য আইনী নাম নিশ্চিতকরণের চুক্তি স্বল্প পরিমাণে রেমিট্যান্সের জন্য শর্তাদি এবং ব্যবহার ওপেন ব্যাংকিং পরিষেবার জন্য ব্যবহারের শর্তাদি বৈদ্যুতিন অর্থ লেনদেনের জন্য ব্যবহারের শর্তাদি @@ -519,7 +517,6 @@ মাল্টিট্র্যাকের নমুনা ক্যামেরার অনুমতি নেই অনুমতি সমাধান হয়নি - কিউআর পড়তে স্ক্যান করুন। প্রসারিত করুণ জুম্ করে কোন তথ্য পাওয়া যায় নি অনুসন্ধান তথ্য তথ্য নির্বাচন করুন @@ -535,7 +532,6 @@ ইমেইল কোড রিওয়ার্ড নোটঃ রিওয়ার্ড পয়েন্টস একবছরের জন্য বৈধ - বন্ধু পড়ুন এবং 7000KRW প্রতি পড়ুন যখন \ nthey প্রথমবারের জন্য অর্থ পাঠান পড়ুন আর ঢুকাও ইমেইল যাচাই করুন @@ -550,4 +546,10 @@ Dismiss Enter your password to setup fingerprint Membership ID + JME Membership ID + Balance with JME + Fraud Guarantee Policy + Fraud Guarantee Policy + Exit + Info \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2562a629..84b39624 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,544 +1,538 @@ - - - - - - - + ホーム + 招待 + 送金 + 代理店 + 個人情報 - - - - - - - - - + ジャパンマネーエクスプレス株式会社 + ジャパンマネーエクスプレス株式会社（JME）は、決済サービス法に基づき、関東財務局に登録された送金会社です。JMEは、世界の様々な地域で、簡単、迅速、安全で信頼性の高い送金方法を提供しています。 + 利用規約 + 個人情報保護方針 + App Version + 更新情報の確認 + フォローする + 利用規約 + 個人情報保護方針 - - - + 支店 + 取引年月日 + 支店はありません - - - - + 取引年月日 + アップデート + このアプリのバージョンは古く、まもなく使用できなくなります。引き続きJMEをご利用いただくには、最新バージョンをインストールしてください。 + 後ほど。 - - - - + QRを生成できません + 残高照会 + 残高照会を希望する金額を入力してください。 + 送信 - - - - - + 受取人の詳細 + 氏名 + 請求金額 + 送金額の確認 + 送金残高 - - - - - - - - - - - - - - - + 管理番号 + 現金ピックアップの引換え + お金と引き換えに、受け取った管理番号を入力してください。 + 管理番号 + 検索 + 送金成功 + 受取人 + 住所 + 携帯電話番号 + 振込先代理店／銀行 + 口座番号 + 合計送金額 + サービス料 + 為替レート + 現金ピックアップの引換え - - - - - - - - - - - - - - - - + PINとパスワードの変更 + PINとパスワードの変更 + 現在のパスワード + 新しいパスワード + パスワードの確認 + 現在のPIN + 新しいPIN + 新しいPINの確認 + 保存 + 処理要求 + PINは空欄に出来ません。 + パスワードは、少なくとも1つの特殊文字、1つの大文字、1つの数字、1つの小文字を含み、8文字以上でなければなりません。 + 取引PINの変更 + お客様のご住所に取引PINを記載した手紙をお送りしていますので、受け取り後、こちらをクリックして、取引暗証番号を変更してください。 + パスワードと取引PINの変更 + ログインパスワードと取引PINを変更するためにここをクリックしてください。 - - - + PINの変更 + PINは6桁の数字でお願いします。 + キャンセル - + お困りの際はいつでもサポート致します（受付時間 09:30～18:30）。 - - + 宅急便 + 本日のレート - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + JMEサービスのご利用を開始するために、当社への登録手続きを行ってください。 + 該当なし + あなたの登録申請は承認手続き中です。すぐにJMEのサービスを利用することができます。 + OTPのリクエストを処理しています。 + 自動引き落とし口座の更新をしてください。 + 自動引き落とし口座の更新が必要となりますので、取引を行う前に口座の更新を行ってください。 + ログアウト + 本当にログアウトしていいですか？ + はい + いいえ + 本当に終了していいですか？ + 該当なし + JME口座番号 + この機能は近日公開予定です。 + ホーム + 送金 + 個人情報 + 残りの年間限度額 + 引き出す + ジャパンマネーエクスプレス株式会社について + 設定 + ログアウト + 本日のレート + 銀行預金 + 取引レポート + 取引明細書 + 通知 + 受取人 + ID更新 + メールに記載されているコードを入力してください。 + 利用可能残高 + 日本円 + 報酬ポイント + お客様のアカウントの確認 + 検証作業中 - - - - - - - - - + 領収書 + ジャパンマネーエクスプレス株式会社に口座を開設してください。 + 送金処理 + 送金キャンセル + 送金依頼人の名前 + 銀行 + 受取金額 + 登録口座 + 完了 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 画像の読み込みに失敗しました。 + 画像がありません。 + JMEにご登録いただきありがとうございます。現在、お客様の情報を確認しています。 + 職業を指定してください。 + 職業が無効です。 + 住所が無効です。 + ビジネスタイプが無効です。 + IDタイプを指定してください。 + 無効なIDタイプ + 無効な滞在資格 + 無効な登録目的 + 無効な携帯番号 + 無効な月収 + 表面ID画像が無効 + 裏面ID画像が無効 + サイドID画像が無効 + 別のID（オプション） + 表面IDサンプル画像 + 裏面IDサンプル画像 + 側面IDサンプル画像 + アクセス拒否 + ファイルを選択 + プライマリID文書 + ID表面 + サンプル画像 + 表面のIDカードの写真をご用意ください。 + ID裏面 + 裏面のIDカードの写真をご用意ください。 + 側面ID + 側面のIDカードの写真をご用意ください。 + 保存そして次へ + 写真を追加 + カメラ + ギャラリー + 現住所の取得に失敗しました。 + IDタイプの検索 + IDタイプの選択 + 検索結果見つからず。 + 在留資格の検索 + 在留資格の選択 + 職業の検索 + 職業の選択 + ビジネスタイプの検索 + ビジネスタイプの選択 + ビジネスタイプの選択 + 登録目的の選択 + 個人情報 + 勤務先名（オプション） + 職業の選択 + 月収 + 携帯電話番号 + 従業員/ビジネスタイプ + 追加住所 + 登録の目的 + ID情報 + IDタイプ + 在留資格 + 氏名、国籍、住所、性別は、ここで提出する本人確認書類に記載されています。 + 登録過程 + 個人情報 + 書類 + 無効な職業選択 + 無効な登録目的 + 無効な追加IDタイプ + 追加IDタイプの検索 + 追加IDタイプの選択 + 追加IDタイプ + 顔写真のサンプル + パスポート + あなたの顔写真 + 正面から見た写真をご用意ください。 + 追加ID書類 + 追加ID表面 + 前の画面で選択した追加IDカードの表面の写真をご用意ください。 + 追加ID裏面 + 前の画面で選択した追加IDカードの裏面の写真をご用意ください。 + 続行するために、全ての画像を提供してください。 + 無効な追加ID + 無効な顔写真 + 無効な追加IDの表面画像 + 無効な追加ID裏面画像 - - - - - - - - + 指紋認証を使用 + JMEへようこそ + JMEを利用するためのIDを入力してください。 + ログイン + ユーザーIDは空欄には出来ません。 + パスワードを忘れた場合 + 登録はこちら + 初めてJMEをご利用になる方へ - - - + 日付 + 新規 + 現時点では何の通知もありません。 - - - - - - - + モバイル認証の完了 + あなたの携帯電話に送信された6桁のOTPコードを入力してください。 + 確認 + 携帯電話認証 + お客様の携帯電話番号の確認 + 携帯電話番号を入力し、登録手続きを行ってください。 + 次へ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + フィールドサイズはxxx文字以上でなければなりません。 + フィールドサイズはxxx文字以下でなければなりません。 + フィールドを空欄には出来ません。 + 重要 + 受取人の削除 + 受取人の編集 + 新しい受取人 + アイコンの検索 + 受取人がいません。 + 続行するにはフォームを入力してください。 + 支店名を入力（3文字以上） + 支店を選択 + 支店を検索 + 支店が見つかりません。 + 国を選択 + 国が見つかりません。 + 受取人を編集 + 受取人の追加 + 誰に送金しますか？ + 決済国を選択 + 支払い方法の選択 + 銀行を選択 + 支店を選択 + 銀行口座番号 + あなたの言語で名前を入力してください。 + ミドルネームを入力してください。 + あなたの言語で苗字を入力してください。 + あなたの言語で名前を入力してください。 + あなたの言語でミドルネームを入力してください。 + あなたの言語で苗字を入力してください。 + あなたの言語でフルネームを入力してください。 + ID番号を入力してください。 + 県を選択 + 市を入力 + 住所を入力 + Emailアドレスを入力 + 関係を選択 + 送金目的を選択 + 受取人の出身国を選択 + 私は以下の項目を読み、同意しました。 + 規約と条件 + 受取人を選択 + IDタイプを選択 + 無効な関係 + 都道府県を選択 + 同意して送信 + 支払国の検索 + 支払い国が見つかりません。 + 自国の検索 + 自国が見つかりません。 + 支払国の検索 + 支払い方法が見つかりません。 + 長押しすると、受取人の個人情報を編集または削除できます。 + 県の検索 + 県の検索 + 県が見つかりません。 + 地区/市検索 + 地区/市が見つかりません。 + 関係を指定 + その国で利用可能な支払い方法はありません。 + 最初に銀行を指定してください。 + 残高照会 + 受取人の削除 + 本当に受取人を削除してよいですか？ + 有効なEメールアドレスを入力してください。 + 送金目的を指定してください。 + 関係を検索 + 関係が見つかりません。 + IDが見つかりません。 + （オプション） + 選択された銀行は現在、利用できません。他の銀行を選択してから手続きを行ってください。 + お客様の受取人情報が最新ではありません。今すぐ更新しますか？ + xxxへの送金を希望しますか？ + 銀行を選んでください + 無効な銀行 + 無効な支店 + 無効な口座番号 + 無効な県 + 無効な区/市 - - - - - - - - - - - - - - - - - - - - - - - + JMEへの登録 + ID番号 + 確認 + 紹介コード（もしありましたら） + Eメールアドレス + 登録 + すでに口座をお持ちですか？ + パスワードを入力してください。 + 携帯電話番号を入力してください。 + 無効なID番号 + 無効なEメールアドレス + 既存のJMEユーザー登録 + お取引の確認には、6桁のお取引用暗証番号が必要となりますので、下記に暗証番号をご指定ください。 + 暗証番号の確認 + 生年月日の選択 + すでにJMEに登録され、サービスを利用されている方は、以下の情報を入力してモバイルログインを申請してください。 + 生年月日 + パスワードが確認済のパスワードと一致しません。 + 暗証番号の確認 + JMEを利用するためのユーザー名を作成してください。 + パスワードは必ず入力してください。 + JMEに口座を登録する必要があります。 + JMEのサービスを利用するには、利用規約に同意する必要があります。 - - - + ユーザーID + ありがとうございます。あなたのIDは正常に更新されました。 + 無効なユーザーID - - - - + パスワードについてお困りですか？ + JMEの口座に登録されているユーザーIDを使って、パスワードを再設定してください。 + 登録済のユーザーID + JMEの口座に登録されているユーザーIDを使って、パスワードを再設定することができます。 - - - - - - - + 指紋認証 + 必要な指先を置いて、本人確認を行ってください。 + 不明な認証が要求されました。 + 現在、指紋認証はご利用いただけません。代わりにパスワードをご利用ください。 + 取引用暗証番号を入力してください。 + クリアー + ログインパスワードを入力してください。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 領収書 + JME管理番号 + 送金明細の要求 + 銀行を選択 + 支店を選択 + 銀行が見つかりません + 送金目的の検索 + 資金源の検索 + 資金源の選択 + 無効な資金源 + 無効な送金目的 + 支払通貨が定義されていません。サポートセンターにお問い合わせください。 + 送金手数料含む + 現在の為替レート + 送金額を指定してください。 + 受取金額を指定してください。 + 計算する + 続ける + お支払方法の検索 + 通貨の選択 + 通貨が見つかりません + 通貨の検索 + 獲得ポイントの目安 + 無効な資金源 + 資金源を指定 + 送金します + 受取人が受取完了 + 資金源の選択 + JMEの利用規約を読み、同意します。 + 決済国 + 取引内容 + 決済国 + 決済方法 + お支払い金額 + サービス料 + 為替レート + 銀行口座番号 + 1. JME 送金利用規約 + 2.不正行為について + 送金依頼を受け取りました。 + お支払いをお願い致します。 + 翌営業日中にJMEにお支払いください。お支払い後、この送金のためのJME番号をお知らせしますのでご確認ください。 + このJME管理番号は厳重に保管してください。 + 取引内容 + 使用したクーポン + お支払い合計金額 + キャンセル依頼 + 変更依頼 + 金額詳細 + 検証 + 送金先 - - - - - - - - - - + 安全のため、再度ログインして指紋認証を行う必要があります。 + パスワードの変更 + 言語 + 言語の選択 + 言語の検索 + 利用可能な言語はありません。 + 設定方法 + 指紋認証を有効にする。 + パスワードでなく、指紋認証を使用しますか？ + 後で設定を変更することが出来ます。 - - - - - + 新規ユーザー + 既存のJMEユーザーでアプリにログインしていない方 + ポイントを貯めて、サプライズギフトをもらいましょう + 地域社会とつながる + 大切な人にお金を送る - - - - - - - - - + JMEはいつでもあなたをサポートします + 件名 + ご要望はこちら + キャンセルのお申込み + 訂正のご依頼 + 件名をご記入ください。 + メッセージ本文をご記入ください。 + JME番号が見つかりません + 取引IDが見つかりません - - - - - - - - - - - + ご利用規約 + 対応する利用規約が見つかりませんでした。 + 利用規約に同意をお願いします。 + 個人情報の取扱いについて + 個人情報収集・利用規約 + 少額送金サービス利用規約 + オープンバンキングサービスの利用規約 + 電子金融取引に関する利用規約 + 同意する - - - - - - - - - - - - - + 取引リポート + 管理番号で検索 + 口座番号で検索 + 日付で検索 + ～から + ～へ + オーケー + 選択した日付範囲が無効です + 管理番号で検索 + 国内 + 国外 + 取引が見つかりません + 支払い完了 - - - - + 紹介コード（オプション） + お客様の口座の確認 + お客様の書類は確認プロセスに入っていますが、時間はかかりません。すぐにJMEのオンラインサービスをご利用いただけます。 + ご利用可能残高 - - - - + イン + アウト + 入出金明細書 + 入出金明細書が見つかりません - + 必要なアクセス許可を与えてください。 - - - - + 引き出し内容 + 金額 + 金額を入力してください（日本円） + あなたの口座から銀行に出金するための必要な金額を入力してください。 - - - - - - - - - - - - - - - - - - - - - - - - - - + 失敗しました。 + GPSがONになっていません + マルチトラッカーサンプル + カメラ許可なし + アクセス許可が解決されていません。 + データが見つかりません + データの検索 + データの選択 + エラー + リトライ + 成功 + 接続失敗 + 操作の失敗 + 現在、位置情報を取得できませんでした。後でもう一度お試しください。 + インターネット接続が見つかりませんでした。接続を確認してください。 + 保留中の招待 + 合計獲得数 + Eメールコード + 報酬 + 注：ポイントは1年間のみ有効です。 + 参照 + もっと見る + Eメールアドレスの確認 + ここをクリックして、あなたのメールアドレスを確認してください。 Your Mobile is not compatiable for biometric login Please click here to change your Login Password Biometric security update required @@ -549,5 +543,11 @@ Dismiss Enter your password to setup fingerprint Membership ID + JME Membership ID + Balance with JME + Fraud Guarantee Policy + Fraud Guarantee Policy + Exit + Info \ No newline at end of file diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 506e2046..3aea791c 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -2,7 +2,7 @@ - घर + गृहपृष्‍ठ आमन्त्रण पैसा पठाऊ धम्कीहरु @@ -13,7 +13,7 @@ जापान मनी एक्सप्रेस एक नवीन अभिनव समाधान हो जुन युवा नेपाली इञ्जिनियरहरूले डिजिटल ग्राहकहरूको रेमिट्यान्स उत्पादनहरू र सेवाहरू पहुँच गर्नका लागि डिजिटल च्यानलहरू सक्षम गर्नका लागि उपभोक्ताको रेमिट्यान्सलाई वास्तविक समयको आधारमा डिजिटल च्यानलहरू प्रयोग गरेर सम्बोधन गर्न सहयोग पुर्‍याउँछ। सबै कन्फिगरेसनहरू ब्याकएन्ड वेब ( backend web ) अनुप्रयोग प्रणालीबाट गरिन्छ। जसले अपरेसन प्रयोगकर्ताहरूलाई सबै कन्फिगरेसनहरू प्रबन्ध गर्न र सही निर्णय लिन अनुमति दिन्छ। सर्त र सर्तहरू गोपनीयता नीति - अनुप्रयोग संस्करण (App Version) + एप भर्सन अद्यावधिकका लागि जाँच गर्नुहोस् हामीलाई पछ्याउनुहोस् नियम र सर्त @@ -65,7 +65,7 @@ पासवर्ड र पिन परिवर्तन गर्नुहोस् वर्तमान पासवर्ड(Current Password) नयाँ पासवर्ड(New Password) - पासवर्ड सुनिश्चित गर्नुहोस + नयाँ पासवर्ड सुनिश्चित गर्नुहोस् हालको पिन(Current Pin) नयाँ पिन(New Pin) नयाँ पिन यकिन गर्नुहोस्(Confirm New Pin) @@ -389,8 +389,8 @@ कुनै बैंक भेटिएन विप्रेषणको उद्देश्य खोज्नुहोस् रकमको स्रोत खोज्नुहोस् - रकमको स्रोत छनौट गर्नुहोस् - कोष को अवैध स्रोत + आम्‍दानीको स्रोत चयन गर्नुहोस् + आम्‍दानीको अवैध स्रोत रेमिट्यान्सको अवैध उद्देश्य No payout currency defined, please contact support. सेवा शुल्क @@ -409,7 +409,7 @@ हजुरले पठाउनुहोस प्रापक हुन्छ आम्दानी को स्रोत चयन गर्नुहोस् - मैले JME सर्तहरू र सर्तहरू पढेको छु र सहमत छु + मैले JME का नियम तथा सर्तहरू पढेको छु र सहमत छु देश लेनदेन विवरण भुक्तानी देश @@ -434,7 +434,7 @@ पठाउन - तपाईको सुरक्षा चिन्ताको लागि तपाईको औठा छाप मान्य गर्न तपाईले फेरि लगईन गर्नु पर्छ। + तपाईँको सुरक्षा सरोकारको लागि तपाईँको औँठा छाप मान्य गर्न तपाईले फेरि लग-इन गर्नुपर्नेछ पासवर्ड परिवर्तन गर्नुहोस् भाषा भाषा छनोट गर्नुस @@ -469,33 +469,31 @@ नियम र सर्तहरू सम्बन्धित नियम र सर्तहरू फेला पार्न सकेन नियम र सर्तहरू स्वीकार गर्नुहोस्। - जापान मनी एक्सप्रेसको वैदेशिक रेमिट्यान्स र घरेलु रेमिट्यान्स सहजै प्रयोग गर्न तपाईले आफ्नो खाताबाट पैसा निकाल्न सहमत हुनु पर्छ। फिर्ता रकम स्थानान्तरण विदेशबाट रेमिट्यान्स र घरेलु रेमिट्यान्स जस्ता सेवाहरूको प्रयोग गर्दा तपाईं फिर्ता लिन सहमत हुनुभएको खाताबाट खुला बैंकि मार्फत गरिनेछ। व्यक्तिगत जानकारी र कार्यान्यन नीति व्यक्तिगत जानकारी संग्रह र उपयोग सम्झौता - कानुन र अवैध व्यवहारको हेरफेर निषेधको लागि कानूनी नाम पुष्टिको सहमति सानो स्केल रकम रेमिट्यान्सका लागि प्रयोगका सर्तहरू खुला बैंकिंग सेवाको लागि प्रयोगका सर्तहरू इलेक्ट्रोनिक वित्त लेनदेन को लागी प्रयोगका सर्तहरु सहमत - पैसा पठाएको विवरण - नियन्त्रण नम्बर द्वारा खोजी गर्नुहोस् + कारोबार विवरण + JME Control Number द्वारा खोजी गर्नुहोस् खाता नम्बर द्वारा खोजी गर्नुहोस् मिति द्वारा फिल्टर बाट सम्म ठिक छ अवैध मिति दायरा चयन गरियो - Control No को साथ खोजी गर्नुहोस् + Control No द्वारा खोजी गर्नुहोस् इन्बाउण्ड आउटबाउन्ड - कुनै लेनदेन भेटिएन + कुनै कारोबार भेटिएन भुक्तनी भएको रेफरल कोड (वैकल्पिक) तपाईको खाता प्रमाणित गर्नुहोस् - तपाईंको कागजात प्रमाणीकरण प्रक्रियामा छ। यसले लामो समय लिन सक्दैन। त्यस पछि तपाईं जापान मनी एक्सप्रेस अनलाइन सेवाको मजा लिन सक्नुहुनेछ। + तपाईंको कागजात प्रमाणीकरण प्रक्रियामा छ, यसले धेरै समय लिने छैन। छिट्टै, तपाईले JME अनलाइन सेवाको मजा लिन सक्नुहुन्छ। तपाईंको उपलब्ध मौजाद रकम @@ -507,18 +505,17 @@ कृपया आवश्यक अनुमतिहरू प्रदान गर्नुहोस् - फिर्ता विवरण + विवरण फिर्ता लिनुहोस् रकम रकम प्रविष्ट गर्नुहोस् (JPY) - कृपया तपाईंको खाताबाट तपाईंको बैंकमा फिर्ता लिन आवश्यक रकम प्रविष्ट गर्नुहोस्। + कृपया तपाईंको खाताबाट तपाईंको बैंकमा झिक्न आवश्यक रकम प्रविष्ट गर्नुहोस्। ओहो! GPS चालू गरिएको छैन बहुचित्रकार नमूना कुनै क्यामेरा अनुमति छैन अनुमति समाधान गरिएको छैन - QR पढ्न स्क्यान गर्नुहोस्(Scan to read QR. Pinch/Stretch to zoom) - कुनै डाटा फेला परेन + कुनै डाटा भेटिएन डाटा खोज गर्नुहोस् डाटा चयन गर्नुहोस् त्रुटि (गल्ति भयो ) @@ -527,17 +524,16 @@ सम्पर्क टुट्यो सञ्चालन विफल भयो अहिले तपाईको स्थान पत्ता लग्न सकेन। पछि पुन: प्रयास गर्नुहोस्। - कुनै इन्टर्नेट जडान फेला परेन। \ nchock तपाईंको जडान - बाकी अनुरोध हरु + कुनै इन्टरनेट जडान फेला परेन। \n आफ्नो जडान जाँच गर्नुहोस् + बाकी अनुरोधहरु कुल आम्दानी इमेल कोड - रिवार्ड - नोट:यो रिवार्ड अंक १ बर्षको लागि मात्र बैध हुनेछ - मित्रलाई सन्दर्भित गर्नुहोस् र 7000krw प्रति सिफारिश गर्नुहोस् - जब n nthey पहिलो पटक पैसा पठाउँदछ + इनाम + नोट:यो इनाम अंक १ बर्षको लागि मात्र मान्य हुनेछ उल्लेख - धेरै लोड + थप लोड गर्नुहोस् ईमेल प्रमाणित गर्नुस - कृपया यहाँ क्लिक गर्नुहोस् तपाईंको ईमेल ठेगाना प्रमाणित गर्न कृपया + तपाईंको ईमेल ठेगाना प्रमाणित गर्न कृपया यहाँ क्लिक गर्नुहोस् Your Mobile is not compatiable for biometric login Please click here to change your Login Password Biometric security update required @@ -548,4 +544,10 @@ Dismiss Enter your password to setup fingerprint Membership ID + JME Membership ID + Balance with JME + Fraud Guarantee Policy + Fraud Guarantee Policy + Exit + Info \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ba7aed1d..b4567395 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -462,10 +462,8 @@ Điều khoản và điều kiện Không thể tìm thấy các điều khoản và điều kiệm tương ứng Vui lòng chấp thuận các điều kiện và điều khoản - Để sử dụng Nhật Bản tiền nhanh \'s kiều hối và chuyển tiền trong nước suôn sẻ, bạn cần phải đồng ý để rút tiền từ tài khoản của bạn. chuyển giao thu hồi sẽ được thực hiện thông qua ngân hàng mở cửa từ tài khoản mà bạn đã đồng ý rút khi sử dụng các dịch vụ như kiều hối và chuyển tiền trong nước. Chính sách xử lý thông tin cá nhân Thỏa thuận thu thập và sử dụng thông tin cá nhân - Thỏa thuận xác nhận tên hợp pháp để tránh các hành vi bất hợp pháp và thao túng pháp luật Điều khoản sử dụng cho việc chuyển tiền quy mô nhỏ Điều khoản sử dụng cho việc mở dịch vụ ngân hàng Điều khoản sử dụng cho giao dịch tài chính điện tử @@ -514,7 +512,6 @@ Multitracker mẫu Không có quyền truy cập máy ảnh Chưa được quyền giải quyết - Quét để đọc QR. Chụm / Kéo dài để thu phóng Không tìm thấy dữ liệu nào Tìm kiếm dữ liệu Chọn dữ liệu @@ -530,7 +527,6 @@ Mã email Điểm thưởng Lưu ý: Điểm thưởng chỉ có hiệu lực trong vòng 1 năm - Tham khảo bạn bè và nhận 7000krw mỗi lần tham khảo khi \ nthey gửi tiền lần đầu tiên Tham khảo Tải thêm Xác nhận Email @@ -545,5 +541,11 @@ Dismiss Enter your password to setup fingerprint Membership ID + JME Membership ID + Balance with JME + Fraud Guarantee Policy + Fraud Guarantee Policy + Exit + Info \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bca97a07..47f73fa6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,8 +32,7 @@ Japan Money Express - Japan Money Express is an innovative solution developed by young Nepali Engineers to enable the digital channel for customers to access the Remittance products and services that addresses consumer’s remittance needs in real-time basis using digital channels. - All the configurations are done from backend web application system which allows operation users to manage all configurations and make right decisions + Japan Money Express (JME) is a registered money transfer company with Kanto Local Financial Bureau under the Payment Services Act. JME provides easy, speedy, safe and reliable way to transfer money in many parts of the world. Terms and Conditions Privacy Policy App Version @@ -45,11 +44,11 @@ Branch Transaction Date - Branches not available + Branch not available New update is available - This version of the app is out of date and will stop working soon. To keep using JME, please install the latest update. + This version of the app is out of date and will stop working soon. To keep using JME please install the latest version. Update Not now @@ -60,7 +59,7 @@ Submit - Reciever Details + Beneficiary Details Full Name Requested Amount Confirm sending amount @@ -85,36 +84,36 @@ Change PIN and Password - Change Password and Pin + Change PIN and Password Current Password New Password Confirm Password - Current Pin - New Pin - Confirm New Pin + Current PIN + New PIN + Confirm New PIN Save Processing request - Pin cannot be empty + PIN cannot be empty Password should contain at least one special character, one uppercase, one number, one lowercase and minimum of 8 characters - Change Transaction Pin - We are sending a letter to your address with a Transaction PIN. After you receive it please click here to change your Transaction PIN. - Change Password and Transaction Pin + Change Transaction PIN + We are sending a letter to your address with a Transaction PIN, after receiving it please click here to change Transaction PIN. + Change Transaction PIN and Password Please click here to change your Login Password and Transaction PIN - Change Pin + Change PIN PIN should be 6 digit number Cancel - We are there to help you \n (Available time 10:00AM - 12:00AM) + We are here to help you (Available time 09:30- 18:30) Home Delivery Today\'s Rate - Kindly complete your registration process with us to start using Japan Money Express services. + Please complete your registration process with us to start using JME services Please verify your primary bank account to complete the registration. Your registration request is in approval process. You will soon be able to use Japan Money Express services. Processing request for OTP @@ -126,7 +125,7 @@ No Are you sure want to exit? "N/A" - JME Account No. + JME Account No This feature is coming soon Home Send Money @@ -166,7 +165,7 @@ +81 Image Loading Failed No image available - Thank you for registering for Japan Money Express. We are verifying your information Once approved + Thank you for registering with JME. We are verifying your information. Other (Please specify) Others (please specify) Other ID (Please Specify) @@ -363,15 +362,15 @@ Referral Code(if any) Email Address Register - Already Have Account ? + Already have an account ? Password cannot be empty Mobile number cannot be empty Invalid ID number Invalid Email Id - Existing JME\nUser Registration - For validating your transaction, you will need a 6 digits transaction PIN, please specify a PIN below + Existing JME\n User Registration + For validating your transaction, you will need the 6 digits transaction PIN, please specify PIN below Confirm Pin - Select dob + Select DOB If you are already registered to JME and using its services currently please apply for mobile login by filling following information Date Of Birth Password does not match confirm password @@ -428,7 +427,7 @@ Search Currency Estimated earning points Invalid Source of Fund - "Specify Source of Fund " + "Specify Source of Fund" You Send Beneficiary Gets Select Source Of Fund @@ -472,11 +471,11 @@ Existing JME Users without App Login Earn reward points and get surprise gifts Connect to local community - Hassle free money transfer to your loved ones + Send Money to your loved ones - We are always there to help you. + We are always here to help you Subject Your request here Request for cancellation @@ -489,10 +488,10 @@ Terms And Conditions Could not find corresponding terms and Conditions Please accept the terms and conditions. - In order to use Japan Money Express\'s overseas remittances and domestic remittances smoothly, you need to agree to withdraw money from your account. Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance. + In order to use Japan Money Express\'s overseas remittances and domestic remittances smoothly, you need to agree to withdraw money from your account. Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance. Personal Information Treatment Policy Personal Information Collection and Usage Agreement - Agreement of Legal Name Confirmation for Prohibiting Manipulation of the Law and Illegal Behavior + Agreement of Legal Name Confirmation for Prohibiting Manipulation of the Law and Illegal Behavior Terms of Use for Small Scale Amount Remittance Terms of Use for Open-Banking Service Terms of Use for Electronic Finance Transaction @@ -516,7 +515,7 @@ Referral Code (Optional) Verify your account - Your document is in verification process. This will not take long. Thereafter you can enjoy Japan Money Express online service. + Your document is in verification process, this will not take long. Shortly, you can enjoy JME online service. Your Available Balance @@ -540,7 +539,7 @@ Multi tracker sample No camera permission Permission not resolved - Scan to read QR. Pinch/Stretch to zoom + Scan to read QR. Pinch/Stretch to zoom No Data Found Search Data Select Data @@ -552,13 +551,13 @@ JME JMEFingerPrint Could not fetch location at the moment. Try again later. - No Internet connection found. \nCheck your connection + No Internet connection found.\n Check your connection Pending Invites Total Earned Email code Reward Note: The reward points is valid for a year only. - Refer to friend and get 7000KRW per refer when \nthey send money for the first time + Refer to friend and get 7000KRW per refer when \nthey send money for the first time Refer Load More Verify email @@ -574,6 +573,14 @@ Please put your finger on your fingerprint sensor in order to validate Dismiss Enter your password to setup fingerprint - Membership ID + Membership ID + + + JME Membership ID + Balance with JME + Fraud Guarantee Policy + Fraud Guarantee Policy + Exit + Info diff --git a/app/src/test/java/com/swifttech/remit/jmecustomer/ExampleUnitTest.java b/app/src/test/java/com/remit/jmecustomer/ExampleUnitTest.java similarity index 97% rename from app/src/test/java/com/swifttech/remit/jmecustomer/ExampleUnitTest.java rename to app/src/test/java/com/remit/jmecustomer/ExampleUnitTest.java index c289ee27..db025a18 100644 --- a/app/src/test/java/com/swifttech/remit/jmecustomer/ExampleUnitTest.java +++ b/app/src/test/java/com/remit/jmecustomer/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.swifttech.remit.jmecustomer; +package com.remit.jmecustomer; import android.text.format.DateFormat; diff --git a/app/src/test/java/com/swifttech/remit/jmecustomer/HomeNotificationHandlerTest.java b/app/src/test/java/com/remit/jmecustomer/HomeNotificationHandlerTest.java similarity index 92% rename from app/src/test/java/com/swifttech/remit/jmecustomer/HomeNotificationHandlerTest.java rename to app/src/test/java/com/remit/jmecustomer/HomeNotificationHandlerTest.java index d26b5375..d94f1d3b 100644 --- a/app/src/test/java/com/swifttech/remit/jmecustomer/HomeNotificationHandlerTest.java +++ b/app/src/test/java/com/remit/jmecustomer/HomeNotificationHandlerTest.java @@ -1,6 +1,7 @@ -package com.swifttech.remit.jmecustomer; +package com.remit.jmecustomer; -import com.swifttech.remit.jmecustomer.features.home.presenter.HomeNotificationHandler; +import com.remit.jmecustomer.RemitApplication; +import com.remit.jmecustomer.features.home.presenter.HomeNotificationHandler; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,10 +9,10 @@ import org.mockito.Mockito; import junitparams.JUnitParamsRunner; -import static com.swifttech.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.AUTO_DEBIT_FILLUP_REQUIRED; -import static com.swifttech.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED; -import static com.swifttech.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED; -import static com.swifttech.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.PENNY_TEST_REQUIRED; +import static com.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.AUTO_DEBIT_FILLUP_REQUIRED; +import static com.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED; +import static com.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED; +import static com.remit.jmecustomer.features.home.presenter.HomeNotificationHandler.HomeNoticeViewTypeEnum.PENNY_TEST_REQUIRED; import static junitparams.JUnitParamsRunner.$; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/app/src/test/java/com/remit/jmecustomer/UtilityTest.java b/app/src/test/java/com/remit/jmecustomer/UtilityTest.java new file mode 100644 index 00000000..d984de4a --- /dev/null +++ b/app/src/test/java/com/remit/jmecustomer/UtilityTest.java @@ -0,0 +1,7 @@ +package com.remit.jmecustomer; + +public class UtilityTest { + + + +} diff --git a/app/src/test/java/com/swifttech/remit/jmecustomer/ValidationRuleTest.java b/app/src/test/java/com/remit/jmecustomer/ValidationRuleTest.java similarity index 97% rename from app/src/test/java/com/swifttech/remit/jmecustomer/ValidationRuleTest.java rename to app/src/test/java/com/remit/jmecustomer/ValidationRuleTest.java index 4ffa2cdc..61c68d08 100644 --- a/app/src/test/java/com/swifttech/remit/jmecustomer/ValidationRuleTest.java +++ b/app/src/test/java/com/remit/jmecustomer/ValidationRuleTest.java @@ -1,6 +1,6 @@ -package com.swifttech.remit.jmecustomer; +package com.remit.jmecustomer; -import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; +import com.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; import org.junit.Test; import org.mockito.Mockito; diff --git a/app/src/test/java/com/swifttech/remit/jmecustomer/UtilityTest.java b/app/src/test/java/com/swifttech/remit/jmecustomer/UtilityTest.java deleted file mode 100644 index ec1951e0..00000000 --- a/app/src/test/java/com/swifttech/remit/jmecustomer/UtilityTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.swifttech.remit.jmecustomer; - -public class UtilityTest { - - - -}