V3

app/src/main/java/com/flutterwave/rave_android/MainActivity.java

@@ -22,6 +22,7 @@
 import com.flutterwave.raveandroid.RaveUiManager;
 import com.flutterwave.raveandroid.data.Utils;
 import com.flutterwave.raveandroid.rave_core.models.SavedCard;
+import com.flutterwave.raveandroid.rave_java_commons.AddressDetails;
 import com.flutterwave.raveandroid.rave_java_commons.Meta;
 import com.flutterwave.raveandroid.rave_java_commons.RaveConstants;
 import com.flutterwave.raveandroid.rave_java_commons.SubAccount;
@@ -32,7 +33,6 @@
 import com.flutterwave.raveandroid.rave_presentation.card.CardPaymentCallback;
 import com.flutterwave.raveandroid.rave_presentation.card.CardPaymentManager;
 import com.flutterwave.raveandroid.rave_presentation.card.SavedCardsListener;
-import com.flutterwave.raveandroid.rave_presentation.data.AddressDetails;
 import com.flutterwave.raveutils.verification.AVSVBVFragment;
 import com.flutterwave.raveutils.verification.OTPFragment;
 import com.flutterwave.raveutils.verification.PinFragment;
@@ -58,8 +58,7 @@ public class MainActivity
     EditText narrationEt;
     EditText currencyEt;
     EditText countryEt;
-    EditText fNameEt;
-    EditText lNameEt;
+    EditText fullNameEt;
     EditText durationEt;
     EditText frequencyEt;
     EditText phoneNumberEt;
@@ -112,8 +111,7 @@ protected void onCreate(Bundle savedInstanceState) {
         narrationEt = findViewById(R.id.narrationTV);
         currencyEt = findViewById(R.id.currencyEt);
         countryEt = findViewById(R.id.countryEt);
-        fNameEt = findViewById(R.id.fNameEt);
-        lNameEt = findViewById(R.id.lnameEt);
+        fullNameEt = findViewById(R.id.fullNameEt);
         phoneNumberEt = findViewById(R.id.phoneNumberEt);
         durationEt = findViewById(R.id.expiryDaysEt);
         frequencyEt = findViewById(R.id.frequencyEt);
@@ -162,6 +160,17 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
             }
         });
 
+        francMobileMoneySwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                if (b) {
+                    countryEt.setVisibility(View.VISIBLE);
+                } else {
+                    countryEt.setVisibility(View.GONE);
+                }
+            }
+        });
+
         cardSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
@@ -254,8 +263,7 @@ private void validateEntries() {
         String txRef = txRefEt.getText().toString();
         String narration = narrationEt.getText().toString();
         String currency = currencyEt.getText().toString();
-        String fName = fNameEt.getText().toString();
-        String lName = lNameEt.getText().toString();
+        String fullName = fullNameEt.getText().toString();
         String phoneNumber = phoneNumberEt.getText().toString();
         String accountDuration = durationEt.getText().toString();
         String accountPaymentFrequency = frequencyEt.getText().toString();
@@ -321,7 +329,7 @@ private void validateEntries() {
                         .acceptRwfMobileMoneyPayments(rwfMobileMoneySwitch.isChecked())
                         .acceptUkPayments(ukbankSwitch.isChecked())
                         .acceptSaBankPayments(saBankSwitch.isChecked())
-                        .acceptFrancMobileMoneyPayments(francMobileMoneySwitch.isChecked())
+                        .acceptFrancMobileMoneyPayments(francMobileMoneySwitch.isChecked(), countryEt.getText().toString())
                         .acceptBankTransferPayments(bankTransferSwitch.isChecked())
                         .acceptUssdPayments(ussdSwitch.isChecked())
                         .acceptBarterPayments(barterSwitch.isChecked())
@@ -330,8 +338,7 @@ private void validateEntries() {
                         .setAmount(Double.parseDouble(amount))
                         .setCurrency(currency)
                         .setEmail(email)
-                        .setfName(fName)
-                        .setlName(lName)
+                        .setFullName(fullName)
                         .setPhoneNumber(phoneNumber, false)
                         .setNarration(narration)
                         .setPublicKey(publicKey)
@@ -365,8 +372,7 @@ private void validateEntries() {
                 raveManager = new RaveNonUIManager().setAmount(Double.parseDouble(amount))
                         .setCurrency(currency)
                         .setEmail(email)
-                        .setfName(fName)
-                        .setlName(lName)
+                        .setFullName(fullName)
                         .setPhoneNumber(phoneNumber)
                         .setNarration(narration)
                         .setPublicKey(publicKey)
@@ -459,8 +465,7 @@ private void clearErrors() {
         narrationEt.setError(null);
         currencyEt.setError(null);
         countryEt.setError(null);
-        fNameEt.setError(null);
-        lNameEt.setError(null);
+        fullNameEt.setError(null);
         durationEt.setError(null);
         frequencyEt.setError(null);
     }

app/src/main/res/layout/activity_main.xml

@@ -149,6 +149,15 @@
                 android:checked="false"
                 android:text="@string/francophone" />
 
+            <EditText
+                android:id="@+id/countryEt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:hint="@string/country_code_e_g_ng"
+                android:textSize="14sp"
+                android:visibility="gone" />
+
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/accountGHMobileMoneySwitch"
                 android:layout_width="match_parent"
@@ -361,30 +370,13 @@
                 android:hint="@string/currency_code_e_g_ngn"
                 android:textSize="14sp" />
 
-            <EditText
-                android:id="@+id/countryEt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:hint="@string/country_code_e_g_ng"
-                android:textSize="14sp"
-                android:visibility="gone" />
-
-
-            <EditText
-                android:id="@+id/fNameEt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:hint="@string/first_name"
-                android:textSize="14sp" />
 
             <EditText
-                android:id="@+id/lnameEt"
+                android:id="@+id/fullNameEt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
-                android:hint="@string/last_name"
+                android:hint="Customer Name"
                 android:textSize="14sp" />
 
             <EditText

rave_android/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java

@@ -13,10 +13,7 @@
 @Parcel
 public class RavePayInitializer {
     private final ArrayList<Integer> orderedPaymentTypesList = new ArrayList<>();
-    private boolean isPhoneEditable = true;
     String phoneNumber = "";
-    private boolean saveCardFeatureAllowed = true;
-    private boolean usePhoneAndEmailSuppliedToSaveCards = true;
     String email;
     double amount;
     String publicKey;
@@ -26,7 +23,6 @@ public class RavePayInitializer {
     String currency;
     String country;
     String fName;
-    String lName;
     String meta;
     String subAccounts;
     String payment_plan;
@@ -38,11 +34,13 @@ public class RavePayInitializer {
     boolean isPermanent;
     int frequency;
     int duration;
+    private boolean isPhoneEditable = true;
+    private boolean saveCardFeatureAllowed = true;
+    private boolean usePhoneAndEmailSuppliedToSaveCards = true;
 
     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,
+                              String currency, String country, String fullName, int theme, String phoneNumber,
                               boolean isPhoneEditable, boolean saveCardFeatureAllowed, boolean usePhoneAndEmailSuppliedToSaveCards,
                               boolean isPermanent, int duration, int frequency,
                               boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth,
@@ -56,7 +54,6 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.currency = currency;
         this.country = country;
         this.fName = fName;
-        this.lName = lName;
         this.isPermanent = isPermanent;
         this.duration = duration;
         this.frequency = frequency;
@@ -96,22 +93,26 @@ public void setMeta(String meta) {
         this.meta = meta;
     }
 
-    public String getSubAccount(){return subAccounts;}
+    public String getSubAccount() {
+        return subAccounts;
+    }
 
-    public void setSubAccount(String subAccounts){this.subAccounts=subAccounts;}
+    public void setSubAccount(String subAccounts) {
+        this.subAccounts = subAccounts;
+    }
 
     public boolean isStaging() {
         return staging;
     }
 
-    public ArrayList<Integer> getOrderedPaymentTypesList() {
-        return orderedPaymentTypesList;
-    }
-
     public void setStaging(boolean staging) {
         this.staging = staging;
     }
 
+    public ArrayList<Integer> getOrderedPaymentTypesList() {
+        return orderedPaymentTypesList;
+    }
+
     public int getTheme() {
         return theme;
     }
@@ -201,15 +202,6 @@ public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
-
-    public String getlName() {
-        return lName;
-    }
-
-    public void setlName(String lName) {
-        this.lName = lName;
-    }
-
     public String getPayment_plan() {
         return payment_plan;
     }
@@ -222,20 +214,22 @@ public void setPreAuth(boolean isPreAuth) {
         this.isPreAuth = isPreAuth;
     }
 
-    public boolean getIsPreAuth() { return  isPreAuth; }
+    public boolean getIsPreAuth() {
+        return isPreAuth;
+    }
 
     public boolean getIsDisplayFee() {
         return displayFee;
     }
 
-    public boolean getIsPhoneEditable() {
-        return isPhoneEditable;
-    }
-
     public void setIsDisplayFee(boolean displayFee) {
         this.displayFee = displayFee;
     }
 
+    public boolean getIsPhoneEditable() {
+        return isPhoneEditable;
+    }
+
     public boolean getIsPermanent() {
         return isPermanent;
     }

rave_android/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java

@@ -122,7 +122,6 @@ public RaveUiManager setCurrency(String currency) {
                 country = "TZ";
                 break;
             default:
-                country = "NG";
                 break;
         }
         return this;
@@ -134,16 +133,23 @@ public RaveUiManager setCountry(String country) {
         return this;
     }
 
+    @Deprecated
     public RaveUiManager setfName(String fName) {
         this.fName = fName;
         return this;
     }
 
+    @Deprecated
     public RaveUiManager setlName(String lName) {
         this.lName = lName;
         return this;
     }
 
+    public RaveUiManager setFullName(String fullName) {
+        this.fullName = fullName;
+        return this;
+    }
+
     public RaveUiManager setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
         return this;
@@ -256,9 +262,10 @@ public RaveUiManager acceptSaBankPayments(boolean withSaBankAccount) {
         return this;
     }
 
-    public RaveUiManager acceptFrancMobileMoneyPayments(boolean withFrancMobileMoney) {
+    public RaveUiManager acceptFrancMobileMoneyPayments(boolean withFrancMobileMoney, String country) {
         if (!orderedPaymentTypesList.contains(PAYMENT_TYPE_FRANCO_MOBILE_MONEY) && withFrancMobileMoney)
             orderedPaymentTypesList.add(PAYMENT_TYPE_FRANCO_MOBILE_MONEY);
+        this.country = country;
         return this;
     }
 
@@ -348,8 +355,7 @@ private RavePayInitializer createRavePayInitializer() {
                 getNarration(),
                 getCurrency(),
                 getCountry(),
-                getfName(),
-                getlName(),
+                getFullName(),
                 theme,
                 getPhoneNumber(),
                 allowEditPhone,

rave_android/src/main/java/com/flutterwave/raveandroid/account/AccountUiPresenter.java

@@ -202,25 +202,27 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
                     .setCountry(NG)
                     .setCurrency(NGN)
                     .setPBFPubKey(ravePayInitializer.getPublicKey())
-                    .setFirstname(ravePayInitializer.getfName())
-                    .setLastname(ravePayInitializer.getlName())
+                    .setFullname(ravePayInitializer.getfName())
                     .setDevice_fingerprint(deviceIdGetter.getDeviceId())
                     .setIP(deviceIdGetter.getDeviceId())
                     .setTxRef(ravePayInitializer.getTxRef())
                     .setAccountbank(dataHashMap.get(fieldBankCode).getData())
                     .setMeta(ravePayInitializer.getMeta())
                     .setSubAccount(ravePayInitializer.getSubAccount())
-                    .setBVN(dataHashMap.get(fieldBVN).getData())
                     .setIsPreAuth(ravePayInitializer.getIsPreAuth());
 
 
             if (dataHashMap.get(fieldAccount) != null && dataHashMap.get(fieldAccount).getData() != null) {
                 builder.setAccountnumber(dataHashMap.get(fieldAccount).getData());
             }
 
+            if (dataHashMap.get(fieldBVN).getData() != null && !dataHashMap.get(fieldBVN).getData().isEmpty())
+                builder.setBVN(dataHashMap.get(fieldBVN).getData());
+
             Payload body = builder.createBankPayload();
-            body.setPasscode(dataHashMap.get(fieldDOB).getData());
-            body.setPhonenumber(dataHashMap.get(fieldPhone).getData());
+            String dob = dataHashMap.get(fieldDOB).getData();
+            if (dob != null && !dob.isEmpty()) body.setPasscode(dob);
+            body.setPhone_number(dataHashMap.get(fieldPhone).getData());
 
 
             boolean isInternetBanking = dataHashMap.get(fieldAccount) == null;