From 073fae43449f646cad34fe4ff31ae8118c1e3aa1 Mon Sep 17 00:00:00 2001 From: Jeremiah Ifeanyichukwu Date: Thu, 14 May 2020 23:21:17 +0100 Subject: [PATCH 01/15] Add option to disable phone number editing --- .../com/flutterwave/raveandroid/RavePayInitializer.java | 8 +++++++- .../java/com/flutterwave/raveandroid/RavePayManager.java | 8 ++++++++ .../flutterwave/raveandroid/account/AccountContract.java | 2 ++ .../flutterwave/raveandroid/account/AccountFragment.java | 6 ++++++ .../flutterwave/raveandroid/account/AccountPresenter.java | 3 +++ .../flutterwave/raveandroid/account/NullAccountView.java | 5 +++++ .../francMobileMoney/FrancMobileMoneyContract.java | 2 ++ .../francMobileMoney/FrancMobileMoneyFragment.java | 6 ++++++ .../francMobileMoney/FrancMobileMoneyPresenter.java | 3 +++ .../francMobileMoney/NullfrancMobileMoneyView.java | 5 +++++ .../raveandroid/ghmobilemoney/GhMobileMoneyContract.java | 3 +++ .../raveandroid/ghmobilemoney/GhMobileMoneyFragment.java | 6 ++++++ .../raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java | 3 +++ .../raveandroid/ghmobilemoney/NullGhMobileMoneyView.java | 5 +++++ .../com/flutterwave/raveandroid/mpesa/MpesaContract.java | 3 +++ .../com/flutterwave/raveandroid/mpesa/MpesaFragment.java | 6 ++++++ .../com/flutterwave/raveandroid/mpesa/MpesaPresenter.java | 3 +++ .../com/flutterwave/raveandroid/mpesa/NullMpesaView.java | 5 +++++ .../rwfmobilemoney/NullRwfMobileMoneyView.java | 5 +++++ .../rwfmobilemoney/RwfMobileMoneyContract.java | 2 ++ .../rwfmobilemoney/RwfMobileMoneyFragment.java | 6 ++++++ .../rwfmobilemoney/RwfMobileMoneyPresenter.java | 3 +++ .../raveandroid/ugmobilemoney/NullUgMobileMoneyView.java | 5 +++++ .../raveandroid/ugmobilemoney/UgMobileMoneyContract.java | 3 +++ .../raveandroid/ugmobilemoney/UgMobileMoneyFragment.java | 6 ++++++ .../raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java | 3 +++ .../raveandroid/zmmobilemoney/NullZmMobileMoneyView.java | 5 +++++ .../raveandroid/zmmobilemoney/ZmMobileMoneyContract.java | 2 ++ .../raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java | 6 ++++++ .../raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java | 3 +++ 30 files changed, 130 insertions(+), 1 deletion(-) diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java index 0ca060a6..186400d1 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java @@ -11,6 +11,7 @@ @Parcel public class RavePayInitializer { private final ArrayList orderedPaymentTypesList = new ArrayList<>(); + private boolean isPhoneEditable = true; String phoneNumber = ""; private boolean saveCardFeatureAllowed = true; String email; @@ -38,7 +39,7 @@ public class RavePayInitializer { public RavePayInitializer(String email, double amount, String publicKey, String encryptionKey, String txRef, String narration, String currency, String country, String fName, - String lName, int theme, String phoneNumber, boolean saveCardFeatureAllowed, + String lName, int theme, String phoneNumber, boolean isPhoneEditable, boolean saveCardFeatureAllowed, boolean isPermanent, int duration, int frequency, boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth, boolean showStagingLabel, boolean displayFee, ArrayList orderedPaymentTypesList) { @@ -62,6 +63,7 @@ public RavePayInitializer(String email, double amount, String publicKey, this.payment_plan = payment_plan; this.isPreAuth = isPreAuth; this.phoneNumber = phoneNumber; + this.isPhoneEditable = isPhoneEditable; this.saveCardFeatureAllowed = saveCardFeatureAllowed; this.showStagingLabel = showStagingLabel; this.displayFee = displayFee; @@ -221,6 +223,10 @@ public boolean getIsDisplayFee() { return displayFee; } + public boolean getIsPhoneEditable() { + return isPhoneEditable; + } + public void setIsDisplayFee(boolean displayFee) { this.displayFee = displayFee; } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java index b3b8942d..f6a742a4 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java @@ -58,6 +58,7 @@ public class RavePayManager { boolean staging = true; boolean isPreAuth = false; private String phoneNumber = ""; + private Boolean allowEditPhone = true; boolean showStagingLabel = true; boolean displayFee = true; private boolean isPermanent = false; @@ -274,6 +275,12 @@ public RavePayManager setPhoneNumber(String phoneNumber) { return this; } + public RavePayManager setPhoneNumber(String phoneNumber, Boolean isEditable) { + this.phoneNumber = phoneNumber; + this.allowEditPhone = isEditable; + return this; + } + public RavePayManager setPaymentPlan(String payment_plan) { this.payment_plan = payment_plan; return this; @@ -329,6 +336,7 @@ public RavePayInitializer createRavePayInitializer() { lName, theme, phoneNumber, + allowEditPhone, allowSaveCard, isPermanent, duration, diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountContract.java index 77c987de..f6fc2a15 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountContract.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountContract.java @@ -46,6 +46,8 @@ interface View { void onRequerySuccessful(RequeryResponse response, String responseAsJSONString); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void onValidationSuccessful(HashMap dataHashMap); void showFieldError(int viewID, String message, Class viewtype); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java index b2aa6543..0c69180f 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java @@ -238,6 +238,12 @@ public void onAmountValidated(String amountToSet, int visibility) { amountEt.setText(amountToSet); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void onValidationSuccessful(HashMap dataHashMap) { presenter.processTransaction(dataHashMap, ravePayInitializer); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java index 258e810a..b7800db2 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java @@ -489,6 +489,9 @@ public void init(RavePayInitializer ravePayInitializer) { } else { mView.onAmountValidated("", View.VISIBLE); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java index 82d69f8e..60c7a3eb 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/NullAccountView.java @@ -89,6 +89,11 @@ public void onRequerySuccessful(RequeryResponse response, String responseAsJSONS } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void onValidationSuccessful(HashMap dataHashMap) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyContract.java index a871d471..a22ff965 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyContract.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyContract.java @@ -22,6 +22,8 @@ interface View { void showPollingIndicator(boolean active); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showProgressIndicator(boolean active); void onAmountValidationSuccessful(String amountToPay); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java index 73ac37b4..18173595 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java @@ -159,6 +159,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java index 2bc434ed..0b53fdb1 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyPresenter.java @@ -273,6 +273,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java index e2a10419..b542b89f 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/NullfrancMobileMoneyView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyContract.java index 4fcc967e..e54029a6 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyContract.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyContract.java @@ -18,6 +18,9 @@ interface View { void showFetchFeeFailed(String s); void onPaymentError(String message); void showPollingIndicator(boolean active); + + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showProgressIndicator(boolean active); void onAmountValidationSuccessful(String valueOf); void displayFee(String charge_amount, Payload payload); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java index bb0df24c..e5a1d35c 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java @@ -217,6 +217,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + private void showInstructionsAndVoucher(boolean show) { if (show) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java index a58a2cbf..fc8367a5 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java @@ -307,6 +307,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java index b1016f19..1347dec3 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaContract.java index d84ab8cf..8590437b 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaContract.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaContract.java @@ -18,6 +18,9 @@ interface View { void showFetchFeeFailed(String s); void onPaymentError(String message); void showPollingIndicator(boolean active); + + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showProgressIndicator(boolean active); void onAmountValidationSuccessful(String amountToPay); void displayFee(String charge_amount, Payload payload); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java index ab28408d..6654336e 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java @@ -160,6 +160,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java index 6a296845..73c75cf3 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java @@ -281,6 +281,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java index 67612d90..ce10cc3c 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/NullMpesaView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java index 2970cf31..148e6046 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/NullRwfMobileMoneyView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyContract.java index cb385f46..3170383b 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyContract.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyContract.java @@ -22,6 +22,8 @@ interface View { void showPollingIndicator(boolean active); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showProgressIndicator(boolean active); void onAmountValidationSuccessful(String amountToPay); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java index 1758fe4e..c87a5516 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java @@ -149,6 +149,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java index 21d19e45..dc0bef36 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenter.java @@ -273,6 +273,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java index 2fc19dce..62585b9d 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/NullUgMobileMoneyView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyContract.java index 99c02fe3..6237f830 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyContract.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyContract.java @@ -18,6 +18,9 @@ interface View { void showFetchFeeFailed(String s); void onPaymentError(String message); void showPollingIndicator(boolean active); + + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showProgressIndicator(boolean active); void onAmountValidationSuccessful(String amountToPay); void displayFee(String charge_amount, Payload payload); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java index 4bc49c4a..79c2530a 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java @@ -165,6 +165,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java index f26eb6a4..06885acb 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java @@ -283,6 +283,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java index 1997d5a3..e64f5537 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/NullZmMobileMoneyView.java @@ -27,6 +27,11 @@ public void showPollingIndicator(boolean active) { } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + + } + @Override public void showProgressIndicator(boolean active) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyContract.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyContract.java index a0cabd74..02b20890 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyContract.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyContract.java @@ -22,6 +22,8 @@ interface View { void showPollingIndicator(boolean active); + void onPhoneValidated(String phoneToSet, boolean isEditable); + void showProgressIndicator(boolean active); void onAmountValidationSuccessful(String valueOf); diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java index ff445f39..47113b71 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java @@ -195,6 +195,12 @@ public void onAmountValidationSuccessful(String amountToPay) { amountEt.setText(amountToPay); } + @Override + public void onPhoneValidated(String phoneToSet, boolean isEditable) { + phoneEt.setText(phoneToSet); + phoneEt.setEnabled(isEditable); + } + private void showInstructionsAndVoucher(boolean show) { if (show) { diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java index 551cd77c..1e7e5dfc 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java @@ -286,6 +286,9 @@ public void init(RavePayInitializer ravePayInitializer) { if (isAmountValid) { mView.onAmountValidationSuccessful(String.valueOf(ravePayInitializer.getAmount())); } + if (phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber())) { + mView.onPhoneValidated(String.valueOf(ravePayInitializer.getPhoneNumber()), ravePayInitializer.getIsPhoneEditable()); + } } } From a1e1def3e2eb8572495829366cdcdc26db6b987a Mon Sep 17 00:00:00 2001 From: Jeremiah Ifeanyichukwu Date: Thu, 14 May 2020 23:32:41 +0100 Subject: [PATCH 02/15] Update Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f51436b5..332506e7 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa | setPublicKey(publicKey) | Merchant's public key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard)| `String` | Required | setEncryptionKey(encryptionKey) | Merchant's encryption key. Get your merchant keys here for [ staging](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-staging-keys-from-the-rave-sandbox-environment) and [live](https://flutterwavedevelopers.readme.io/blog/how-to-get-your-live-keys-from-the-rave-dashboard) | `String` | Required | setTxRef(txRef) | This is the unique reference, unique to the particular transaction being carried out. It is generated by the merchant for every transaction | `String` | Required -| setPhoneNumber(phoneNumber) | This is the customer's phone number. | `String` | Not Required +| setPhoneNumber(phoneNumber) | This sets the customer's phone number. This functions is also overloaded to allow you specify whether the customer can edit their phone number as such: `setPhoneNumber(phoneNumber,false)`. When set to false, the user will not be able to change the number you set here.| `String`

Optional overloads:
`String`, `boolean` | Not Required | acceptAccountPayments(boolean) | Set to `true` if you want to accept payments via bank accounts, else set to `false`. | `boolean` | Not Required | acceptCardPayments(boolean) | Set to `true` if you want to accept payments via cards, else set to `false` | `boolean` | Not Required | | acceptMpesaPayments(boolean) | Set to `true` if you want to accept Mpesa payments, else set to `false` . For this option to work, you should set your country to `KE` and your currency to `KES` | `boolean` | Not Required | From 05de28c15cc871c71a2bf59a3bcecf9e4c43e9fa Mon Sep 17 00:00:00 2001 From: bolajikassim Date: Fri, 15 May 2020 00:07:18 +0100 Subject: [PATCH 03/15] bumped version to 1.0.49.2 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 12647835..d7dfdba3 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ The minimum supported SDK version is 15 **Step 2.** Add the dependency dependencies { - implementation 'com.github.Flutterwave:rave-android:1.0.49.1' + implementation 'com.github.Flutterwave:rave-android:1.0.49.2' } **Step 3.** Add the `INTERNET` permission to your android manifest @@ -51,7 +51,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa .setPublicKey(publicKey) .setEncryptionKey(encryptionKey) .setTxRef(txRef) - .setPhoneNumber(phoneNumber) + .setPhoneNumber(phoneNumber, boolean) .acceptAccountPayments(boolean) .acceptCardPayments(boolean) .acceptMpesaPayments(boolean) From 4966f4bc5bbf6649f4f9ced02054b0089111b421 Mon Sep 17 00:00:00 2001 From: bolajikassim Date: Tue, 19 May 2020 00:27:50 +0100 Subject: [PATCH 04/15] fixed material components TextInputLayout's background issue --- .../src/main/res/layout/rave_sdk_avsvbv_layout.xml | 10 ++++++++++ .../main/res/layout/rave_sdk_fragment_account.xml | 10 ++++++++++ .../src/main/res/layout/rave_sdk_fragment_ach.xml | 3 +++ .../main/res/layout/rave_sdk_fragment_barter.xml | 2 ++ .../src/main/res/layout/rave_sdk_fragment_card.xml | 14 ++++++++++++++ .../res/layout/rave_sdk_fragment_francophone.xml | 4 ++++ .../layout/rave_sdk_fragment_gh_mobile_money.xml | 6 ++++++ .../main/res/layout/rave_sdk_fragment_mpesa.xml | 4 ++++ .../layout/rave_sdk_fragment_rwf_mobile_money.xml | 4 ++++ .../layout/rave_sdk_fragment_sa_bank_account.xml | 2 ++ .../layout/rave_sdk_fragment_ug_mobile_money.xml | 4 ++++ .../src/main/res/layout/rave_sdk_fragment_uk.xml | 2 ++ .../src/main/res/layout/rave_sdk_fragment_ussd.xml | 2 ++ .../layout/rave_sdk_fragment_zm_mobile_money.xml | 4 ++++ .../src/main/res/layout/rave_sdk_otp_layout.xml | 2 ++ .../src/main/res/layout/rave_sdk_pin_layout.xml | 6 +++++- 16 files changed, 78 insertions(+), 1 deletion(-) diff --git a/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml b/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml index e616b45c..313a246e 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml @@ -2,6 +2,7 @@ @@ -33,6 +34,7 @@ android:text="@string/enter_your_billing_address_details"/> diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml index 983ddfc1..4ee244f2 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml @@ -1,5 +1,6 @@ @@ -24,6 +26,7 @@ android:text="@string/please_enter_your_card_pin_nto_continue_your_transaction"/> Date: Tue, 19 May 2020 00:44:01 +0100 Subject: [PATCH 05/15] fixed material components TextInputLayout's background issue --- .../src/main/res/layout/rave_sdk_avsvbv_layout.xml | 10 +++++----- .../main/res/layout/rave_sdk_fragment_account.xml | 10 +++++----- .../src/main/res/layout/rave_sdk_fragment_ach.xml | 2 +- .../main/res/layout/rave_sdk_fragment_barter.xml | 2 +- .../src/main/res/layout/rave_sdk_fragment_card.xml | 14 +++++++------- .../res/layout/rave_sdk_fragment_francophone.xml | 4 ++-- .../layout/rave_sdk_fragment_gh_mobile_money.xml | 6 +++--- .../main/res/layout/rave_sdk_fragment_mpesa.xml | 4 ++-- .../layout/rave_sdk_fragment_rwf_mobile_money.xml | 4 ++-- .../layout/rave_sdk_fragment_sa_bank_account.xml | 2 +- .../layout/rave_sdk_fragment_ug_mobile_money.xml | 4 ++-- .../src/main/res/layout/rave_sdk_fragment_uk.xml | 2 +- .../src/main/res/layout/rave_sdk_fragment_ussd.xml | 2 +- .../layout/rave_sdk_fragment_zm_mobile_money.xml | 4 ++-- .../src/main/res/layout/rave_sdk_otp_layout.xml | 2 +- .../src/main/res/layout/rave_sdk_pin_layout.xml | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml b/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml index 313a246e..c0191ae7 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml @@ -34,7 +34,7 @@ android:text="@string/enter_your_billing_address_details"/> diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml index 4ee244f2..82bfee6a 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml @@ -23,7 +23,7 @@ @@ -42,7 +42,7 @@ @@ -67,7 +67,7 @@ android:orientation="vertical"> diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml index 5ea6a904..e1899edf 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml @@ -41,7 +41,7 @@ tools:context="com.flutterwave.raveandroid.ghmobilemoney.GhMobileMoneyFragment"> @@ -43,7 +43,7 @@ diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml index abc6c8d9..9d22d8a0 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml @@ -24,7 +24,7 @@ android:orientation="vertical"> diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml index 868e8576..8d7364f5 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml @@ -27,7 +27,7 @@ app:layout_constraintTop_toBottomOf="@+id/banks_spinner" /> Date: Tue, 19 May 2020 00:48:12 +0100 Subject: [PATCH 06/15] fixed material components TextInputLayout's background issue --- .../src/main/res/layout/rave_sdk_avsvbv_layout.xml | 10 +++++----- .../main/res/layout/rave_sdk_fragment_account.xml | 10 +++++----- .../src/main/res/layout/rave_sdk_fragment_ach.xml | 2 +- .../main/res/layout/rave_sdk_fragment_barter.xml | 2 +- .../src/main/res/layout/rave_sdk_fragment_card.xml | 14 +++++++------- .../res/layout/rave_sdk_fragment_francophone.xml | 4 ++-- .../layout/rave_sdk_fragment_gh_mobile_money.xml | 6 +++--- .../main/res/layout/rave_sdk_fragment_mpesa.xml | 4 ++-- .../layout/rave_sdk_fragment_rwf_mobile_money.xml | 4 ++-- .../layout/rave_sdk_fragment_sa_bank_account.xml | 2 +- .../layout/rave_sdk_fragment_ug_mobile_money.xml | 4 ++-- .../src/main/res/layout/rave_sdk_fragment_uk.xml | 2 +- .../src/main/res/layout/rave_sdk_fragment_ussd.xml | 2 +- .../layout/rave_sdk_fragment_zm_mobile_money.xml | 4 ++-- .../src/main/res/layout/rave_sdk_otp_layout.xml | 2 +- .../src/main/res/layout/rave_sdk_pin_layout.xml | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml b/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml index c0191ae7..63e396f6 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_avsvbv_layout.xml @@ -34,7 +34,7 @@ android:text="@string/enter_your_billing_address_details"/> diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml index 82bfee6a..4d1793e4 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_card.xml @@ -23,7 +23,7 @@ @@ -42,7 +42,7 @@ @@ -67,7 +67,7 @@ android:orientation="vertical"> diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml index e1899edf..cab2f323 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml @@ -41,7 +41,7 @@ tools:context="com.flutterwave.raveandroid.ghmobilemoney.GhMobileMoneyFragment"> @@ -43,7 +43,7 @@ diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml index 9d22d8a0..71e66613 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml @@ -24,7 +24,7 @@ android:orientation="vertical"> diff --git a/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml b/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml index 8d7364f5..1431107f 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_fragment_ussd.xml @@ -27,7 +27,7 @@ app:layout_constraintTop_toBottomOf="@+id/banks_spinner" /> Date: Tue, 19 May 2020 01:02:55 +0100 Subject: [PATCH 07/15] migrated to AndroidX --- app/build.gradle | 14 +++--- .../rave_android/ExampleInstrumentedTest.java | 4 +- .../rave_android/MainActivity.java | 6 +-- app/src/main/res/layout/activity_main.xml | 48 +++++++++---------- gradle.properties | 2 + raveandroid/build.gradle | 22 ++++----- .../raveandroid/ExampleInstrumentedTest.java | 4 +- .../raveandroid/MainPagerAdapter.java | 6 +-- .../flutterwave/raveandroid/RaveFragment.java | 2 +- .../raveandroid/RavePayActivity.java | 18 +++---- .../raveandroid/RavePayManager.java | 2 +- .../flutterwave/raveandroid/WebFragment.java | 2 +- .../raveandroid/account/AccountFragment.java | 14 +++--- .../account/BanksRecyclerAdapter.java | 2 +- .../raveandroid/ach/AchFragment.java | 8 ++-- .../banktransfer/BankTransferFragment.java | 12 ++--- .../raveandroid/barter/BarterFragment.java | 8 ++-- .../raveandroid/card/CardFragment.java | 10 ++-- .../raveandroid/card/CreditCardView.java | 2 +- .../card/SavedCardRecyclerAdapter.java | 2 +- .../card/savedcards/SavedCardsActivity.java | 4 +- .../card/savedcards/SavedCardsFragment.java | 6 +-- .../raveandroid/data/NetworkRequestImpl.java | 2 +- .../FrancMobileMoneyFragment.java | 8 ++-- .../ghmobilemoney/GhMobileMoneyFragment.java | 8 ++-- .../raveandroid/mpesa/MpesaFragment.java | 8 ++-- .../RwfMobileMoneyFragment.java | 8 ++-- .../sabankaccount/SaBankAccountFragment.java | 12 ++--- .../ugmobilemoney/UgMobileMoneyFragment.java | 8 ++-- .../raveandroid/uk/UkFragment.java | 8 ++-- .../raveandroid/ussd/UssdFragment.java | 12 ++--- .../verification/AVSVBVFragment.java | 6 +-- .../raveandroid/verification/OTPFragment.java | 6 +-- .../raveandroid/verification/PinFragment.java | 6 +-- .../verification/VerificationActivity.java | 4 +- .../verification/web/WebFragment.java | 2 +- .../zmmobilemoney/ZmMobileMoneyFragment.java | 8 ++-- .../res/layout/rave_sdk_activity_rave_pay.xml | 4 +- .../layout/rave_sdk_add_exisiting_bank.xml | 2 +- .../res/layout/rave_sdk_avsvbv_layout.xml | 30 ++++++------ .../res/layout/rave_sdk_card_preview_item.xml | 4 +- .../res/layout/rave_sdk_content_rave_pay.xml | 4 +- .../res/layout/rave_sdk_fragment_account.xml | 34 ++++++------- .../main/res/layout/rave_sdk_fragment_ach.xml | 6 +-- .../rave_sdk_fragment_bank_transfer.xml | 18 +++---- .../res/layout/rave_sdk_fragment_barter.xml | 10 ++-- .../res/layout/rave_sdk_fragment_card.xml | 46 +++++++++--------- .../layout/rave_sdk_fragment_francophone.xml | 16 +++---- .../rave_sdk_fragment_gh_mobile_money.xml | 22 ++++----- .../res/layout/rave_sdk_fragment_mpesa.xml | 16 +++---- .../rave_sdk_fragment_rwf_mobile_money.xml | 16 +++---- .../rave_sdk_fragment_sa_bank_account.xml | 10 ++-- .../rave_sdk_fragment_ug_mobile_money.xml | 16 +++---- .../main/res/layout/rave_sdk_fragment_uk.xml | 10 ++-- .../res/layout/rave_sdk_fragment_ussd.xml | 16 +++---- .../rave_sdk_fragment_zm_mobile_money.xml | 16 +++---- .../main/res/layout/rave_sdk_otp_layout.xml | 8 ++-- ..._sdk_payment_fragment_container_layout.xml | 4 +- .../layout/rave_sdk_payment_title_layout.xml | 4 +- .../rave_sdk_payment_type_tile_layout.xml | 8 ++-- .../rave_sdk_pick_saved_card_layout.xml | 6 +-- .../main/res/layout/rave_sdk_pin_layout.xml | 6 +-- .../account/AccountPresenterTest.java | 2 +- .../BankTransferPresenterTest.java | 2 +- .../raveandroid/card/CardPresenterTest.java | 2 +- .../FrancMobileMoneyPresenterTest.java | 2 +- .../GhMobileMoneyPresenterTest.java | 2 +- .../raveandroid/mpesa/MpesaPresenterTest.java | 2 +- .../RwfMobileMoneyPresenterTest.java | 2 +- .../UgMobileMoneyPresenterTest.java | 2 +- .../raveandroid/uk/UkPresenterTest.java | 2 +- .../raveandroid/ussd/UssdPresenterTest.java | 4 +- .../ZmMobileMoneyPresenterTest.java | 2 +- 73 files changed, 331 insertions(+), 329 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 16a79f31..566cb8f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.flutterwave.rave_android" minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -27,12 +27,12 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:support-v4:27.1.1' - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' implementation project(':raveandroid') } diff --git a/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java index b18fa80f..87534839 100644 --- a/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/flutterwave/rave_android/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.flutterwave.rave_android; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java index 42c60d1b..a4346c0d 100644 --- a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java +++ b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java @@ -2,9 +2,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SwitchCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 73246446..b50d0889 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index aac7c9b4..9e6fce10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/raveandroid/build.gradle b/raveandroid/build.gradle index b7f8c0cb..d1b183e3 100644 --- a/raveandroid/build.gradle +++ b/raveandroid/build.gradle @@ -3,15 +3,15 @@ apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.flutterwave' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0.43" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -32,32 +32,32 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' - implementation 'org.parceler:parceler-api:1.1.9' - annotationProcessor 'org.parceler:parceler:1.1.9' + implementation 'org.parceler:parceler-api:1.1.12' + annotationProcessor 'org.parceler:parceler:1.1.12' implementation 'com.squareup.retrofit2:converter-scalars:2.1.0' implementation 'com.scottyab:aescrypt:0.0.1' testImplementation 'junit:junit:4.12' // dagger 2 implementation 'com.google.dagger:dagger:2.17' annotationProcessor 'com.google.dagger:dagger-compiler:2.17' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'com.google.dagger:dagger:2.17' testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.17' testImplementation 'org.mockito:mockito-core:2.25.0' testImplementation 'org.mockito:mockito-inline:2.13.0' - implementation 'com.android.support:cardview-v7:27.1.1' + implementation 'androidx.cardview:cardview:1.0.0' } diff --git a/raveandroid/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java b/raveandroid/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java index 7731b498..e6ef47b1 100644 --- a/raveandroid/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java +++ b/raveandroid/src/androidTest/java/com/flutterwave/raveandroid/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.flutterwave.raveandroid; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/MainPagerAdapter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/MainPagerAdapter.java index 42c0747b..1aee86f8 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/MainPagerAdapter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/MainPagerAdapter.java @@ -1,8 +1,8 @@ package com.flutterwave.raveandroid; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import java.util.ArrayList; import java.util.List; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveFragment.java index de7a742b..39966060 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/RaveFragment.java @@ -1,7 +1,7 @@ package com.flutterwave.raveandroid; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; /** * Created by hamzafetuga on 21/07/2017. diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java index 0b677d6c..fe58e015 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java @@ -7,14 +7,14 @@ import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; -import android.support.constraint.ConstraintLayout; -import android.support.constraint.ConstraintSet; -import android.support.constraint.Guideline; -import android.support.transition.AutoTransition; -import android.support.transition.TransitionManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.ConstraintSet; +import androidx.constraintlayout.widget.Guideline; +import androidx.transition.AutoTransition; +import androidx.transition.TransitionManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.view.ViewCompat; +import androidx.appcompat.app.AppCompatActivity; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.StyleSpan; @@ -55,7 +55,7 @@ import javax.inject.Inject; -import static android.support.constraint.ConstraintLayout.LayoutParams.HORIZONTAL; +import static androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.HORIZONTAL; import static com.flutterwave.raveandroid.RaveConstants.LIVE_URL; import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_ACCOUNT; import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_ACH; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java index f6a742a4..40396c10 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java @@ -2,7 +2,7 @@ import android.app.Activity; import android.content.Intent; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import com.flutterwave.raveandroid.di.components.AppComponent; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java index 71f5e29d..f67702dd 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java @@ -7,7 +7,7 @@ import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java index 9f221f25..1d7af463 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java @@ -7,13 +7,13 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.BottomSheetDialog; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java index b8e45946..fa509035 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java @@ -1,7 +1,7 @@ package com.flutterwave.raveandroid.account; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java index e3a5b273..4ca7c681 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java index 60a4085e..11147dc1 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java @@ -5,12 +5,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java index 78ebaf75..b52af1ce 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java index 5721c0c4..886bab7f 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java @@ -6,11 +6,11 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.SwitchCompat; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.SwitchCompat; import android.text.Editable; import android.text.TextWatcher; import android.text.method.LinkMovementMethod; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java index a4467042..22a3dfee 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.design.widget.TextInputEditText; +import com.google.android.material.textfield.TextInputEditText; import android.text.InputType; import android.util.AttributeSet; import android.util.Log; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/SavedCardRecyclerAdapter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/SavedCardRecyclerAdapter.java index 33c4fb9a..53dd77e7 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/SavedCardRecyclerAdapter.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/SavedCardRecyclerAdapter.java @@ -1,7 +1,7 @@ package com.flutterwave.raveandroid.card; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java index 13e08db8..e612977e 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java @@ -2,8 +2,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; import com.flutterwave.raveandroid.R; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java index 82de8245..a51df77a 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java @@ -2,9 +2,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableString; import android.text.style.UnderlineSpan; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/NetworkRequestImpl.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/data/NetworkRequestImpl.java index 76a9b776..274b3e6e 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/data/NetworkRequestImpl.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/data/NetworkRequestImpl.java @@ -1,6 +1,6 @@ package com.flutterwave.raveandroid.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.flutterwave.raveandroid.FeeCheckRequestBody; import com.flutterwave.raveandroid.Payload; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java index 5d8360c9..746c99b7 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java index e1e277b0..5da7ed6d 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java index 2fbe9af9..4d2ac0a9 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java index 3badbfee..c2c71b4b 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java index a404acce..27c17279 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/sabankaccount/SaBankAccountFragment.java @@ -5,12 +5,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java index f6d15054..d15fc708 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java index 6d46fa3c..af1e92fe 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java @@ -6,10 +6,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java index a778a947..382c282c 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java @@ -8,12 +8,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.constraint.ConstraintLayout; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.AppCompatSpinner; +import androidx.constraintlayout.widget.ConstraintLayout; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.AppCompatSpinner; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java index 6a3d83aa..5ef39466 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/AVSVBVFragment.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java index f872e6f9..8104c1c5 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/OTPFragment.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java index 5e2d12d1..c24b8d9d 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/PinFragment.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java index ac614e0f..795bf001 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java @@ -2,8 +2,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import com.flutterwave.raveandroid.R; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java index 28a8de2a..523e1a2d 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/verification/web/WebFragment.java @@ -7,7 +7,7 @@ import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java index d31c1e46..f3382242 100644 --- a/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java +++ b/raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/raveandroid/src/main/res/layout/rave_sdk_activity_rave_pay.xml b/raveandroid/src/main/res/layout/rave_sdk_activity_rave_pay.xml index d611b559..856c9f0b 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_activity_rave_pay.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_activity_rave_pay.xml @@ -1,9 +1,9 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/raveandroid/src/main/res/layout/rave_sdk_add_exisiting_bank.xml b/raveandroid/src/main/res/layout/rave_sdk_add_exisiting_bank.xml index 79c8dd4b..dbc58b27 100644 --- a/raveandroid/src/main/res/layout/rave_sdk_add_exisiting_bank.xml +++ b/raveandroid/src/main/res/layout/rave_sdk_add_exisiting_bank.xml @@ -18,7 +18,7 @@ android:id="@+id/rave_payment_type_title_textView" /> - - - - + - - - + - - - + - - - + - - - +