AmountValidator Update

Author: mikelis135

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

@@ -20,6 +20,7 @@
 import com.flutterwave.raveandroid.R;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
+import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.ViewObject;
 
 import java.util.HashMap;
@@ -90,8 +91,11 @@ private void initializeViews() {
     public void onClick(View view) {
         int i = view.getId();
         if (i == R.id.rave_payButton) {
-            clearErrors();
-            collectData();
+            if (getActivity() != null) {
+                Utils.hide_keyboard(getActivity());
+                clearErrors();
+                collectData();
+            }
         }
     }
 

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

@@ -168,10 +168,10 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
         String phone = dataHashMap.get(fieldPhone).getData();
         Class phoneViewType = dataHashMap.get(fieldPhone).getViewType();
 
-        boolean isAmountValidated = amountValidator.isAmountValid(amount);
+        boolean isAmountValid = amountValidator.isAmountValid(amount);
         boolean isPhoneValid = phoneValidator.isPhoneValid(phone);
 
-        if (!isAmountValidated) {
+        if (!isAmountValid) {
             valid = false;
             mView.showFieldError(amountID, validAmountPrompt, amountViewType);
         }
@@ -195,7 +195,7 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
             ravePayInitializer.setAmount(Double.parseDouble(dataHashMap.get(fieldAmount).getData()));
 
             PayloadBuilder builder = new PayloadBuilder();
-            builder.setAmount(ravePayInitializer.getAmount() + "")
+            builder.setAmount(String.valueOf(ravePayInitializer.getAmount()))
                     .setCountry(ravePayInitializer.getCountry())
                     .setCurrency(ravePayInitializer.getCurrency())
                     .setEmail(ravePayInitializer.getEmail())

raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java

@@ -1,7 +1,5 @@
 package com.flutterwave.raveandroid.validators;
 
-import java.util.regex.Pattern;
-
 public class AmountValidator {
 
     public boolean isAmountValid(Double amount) {
@@ -10,9 +8,17 @@ public boolean isAmountValid(Double amount) {
 
     public boolean isAmountValid(String amount) {
 
-        if (amount != null && !amount.isEmpty()) {
-            return Pattern.matches("^[0-9]*$", amount);
-        } else {
+        try {
+            if (amount != null) {
+                if (!amount.isEmpty()) {
+                    return Double.parseDouble(amount) > 0;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } catch (NumberFormatException e) {
             return false;
         }
 

raveandroid/src/test/java/com/flutterwave/raveandroid/validators/AmountValidatorTest.java

@@ -20,7 +20,7 @@ public void setUp() throws Exception {
 
     @Test
     public void isAmountValid_isCorrectAmountPassed_returnsTrue() {
-        Double amount = 1.0;
+        Double amount = 123.0;
         boolean isAmountValid = SUT.isAmountValid(amount);
         assertThat(true, is(isAmountValid));
     }