Refactor view and presenter

Author: jeremiahAI

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java

@@ -445,7 +445,6 @@ public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
     @Override
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
 
-        ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
 
         dataHashMap.put(RaveConstants.fieldBVN, new ViewObject(bvnEt.getId(), bvnEt.getText().toString(), TextInputLayout.class));
         dataHashMap.put(RaveConstants.fieldDOB, new ViewObject(dateOfBirthEt.getId(), dateOfBirthEt.getText().toString(), TextInputLayout.class));

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java

@@ -297,6 +297,9 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
         //make request
 
         if (ravePayInitializer!=null) {
+
+            ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
+
             PayloadBuilder builder = new PayloadBuilder();
             builder.setAmount(ravePayInitializer.getAmount() + "")
                     .setEmail(dataHashMap.get(RaveConstants.fieldEmail).getData())

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

@@ -96,9 +96,7 @@ public void onClick(View view) {
             clearErrors();
             Utils.hide_keyboard(getActivity());
             collectData();
-        }
-
-        if (viewId == verifyPaymentButton.getId()) {
+        } else if (viewId == verifyPaymentButton.getId()) {
             verifyPayment();
         }
     }
@@ -318,7 +316,6 @@ public void showFetchFeeFailed(String s) {
     @Override
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
 
-        ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
         presenter.processTransaction(dataHashMap, ravePayInitializer);
 
     }

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java

@@ -201,6 +201,8 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
 
         if (ravePayInitializer != null) {
 
+            ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
+
             PayloadBuilder builder = new PayloadBuilder();
             builder.setAmount(ravePayInitializer.getAmount() + "")
                     .setCountry(ravePayInitializer.getCountry())

raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java

@@ -166,7 +166,6 @@ private void collectData() {
     @Override
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
 
-        ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
         presenter.processTransaction(dataHashMap, ravePayInitializer);
 
     }

raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java

@@ -152,6 +152,8 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
 
         if (ravePayInitializer!=null) {
 
+            ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
+
             PayloadBuilder builder = new PayloadBuilder();
             builder.setAmount(ravePayInitializer.getAmount() + "")
                     .setCountry(ravePayInitializer.getCountry())

raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java

@@ -227,7 +227,6 @@ public void onPaymentFailed(String message, String responseAsJSONString) {
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
 
         presenter.processTransaction(dataHashMap, ravePayInitializer);
-        ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
 
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java

@@ -183,6 +183,8 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
 
         if (ravePayInitializer!=null) {
 
+            ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
+
             PayloadBuilder builder = new PayloadBuilder();
             builder.setAmount(ravePayInitializer.getAmount() + "")
                     .setCountry(ravePayInitializer.getCountry())

raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java

@@ -243,7 +243,6 @@ public void onPaymentFailed(String message, String responseAsJSONString) {
     @Override
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
 
-        ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
         presenter.processTransaction(dataHashMap, ravePayInitializer);
 
     }

raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java

@@ -177,6 +177,8 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
 
         if (ravePayInitializer!=null) {
 
+            ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(RaveConstants.fieldAmount).getData()));
+
             PayloadBuilder builder = new PayloadBuilder();
             builder.setAmount(ravePayInitializer.getAmount() + "")
 //                    .setCountry(ravePayInitializer.getCountry())