Merge pull request #219 from bolaware/master

Prefill phone-number in AccountFragment if available

Author: bolaware

ChargeVerificationUtils.md

@@ -13,7 +13,7 @@ This module helps you handle charge verification when not using the default drop
 **Step 2.** Add the dependency for the utils library
 
     dependencies {
-	     implementation 'com.github.Flutterwave.rave-android:rave_utils:2.1.5'
+	     implementation 'com.github.Flutterwave.rave-android:rave_utils:2.1.6'
 	}
 
 **Step 2.**  In your payment activity or fragment, create and instance of the `RaveVerificationUtils` class

README.md

@@ -29,13 +29,13 @@ The payment methods currently supported are Cards, USSD, Mpesa, GH Mobile Money,
 If you want to use the default Drop In UI, add the `rave_android` module dependency
 
     dependencies {
-	     implementation 'com.github.Flutterwave.rave-android:rave_android:2.1.5'
+	     implementation 'com.github.Flutterwave.rave-android:rave_android:2.1.6'
 	}
 
 but if you are not interested in our default UI and you want to use yours and only want to interact with our core sdk, use the `rave_presentation` module
 
     dependencies {
-	     implementation 'com.github.Flutterwave.rave-android:rave_presentation:2.1.5'
+	     implementation 'com.github.Flutterwave.rave-android:rave_presentation:2.1.6'
 	}
 
 **Step 3.** Add the  `INTERNET` permission to your android manifest

rave_android/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 1
-        versionName "2.1.5"
+        versionName "2.1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -236,6 +236,12 @@ public void onAmountValidated(String amountToSet, int visibility) {
         amountEt.setText(amountToSet);
     }
 
+    @Override
+    public void onPhoneNumberValidated(String phoneNumber, int visibility) {
+        phoneTil.setVisibility(visibility);
+        phoneEt.setText(phoneNumber);
+    }
+
     @Override
     public void onDataValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
         presenter.processTransaction(dataHashMap, ravePayInitializer);

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

@@ -26,6 +26,8 @@ interface View extends AccountContract.AccountInteractor {
 
         void onAmountValidated(String amountToSet, int visibility);
 
+        void onPhoneNumberValidated(String phoneNumber, int visibility);
+
         void showDateOfBirth(int isVisible);
 
         void showBVN(int isVisible);

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

@@ -252,6 +252,7 @@ public void init(RavePayInitializer ravePayInitializer) {
 
             boolean isEmailValid = emailValidator.isEmailValid(ravePayInitializer.getEmail());
             boolean isAmountValid = amountValidator.isAmountValid(ravePayInitializer.getAmount());
+            boolean isPhoneValid = phoneValidator.isPhoneValid(ravePayInitializer.getPhoneNumber());
 
             if (isEmailValid) {
                 mView.onEmailValidated(ravePayInitializer.getEmail(), View.GONE);
@@ -263,6 +264,11 @@ public void init(RavePayInitializer ravePayInitializer) {
             } else {
                 mView.onAmountValidated("", View.VISIBLE);
             }
+            if(isPhoneValid){
+                mView.onPhoneNumberValidated(ravePayInitializer.getPhoneNumber(), View.VISIBLE);
+            } else {
+                mView.onPhoneNumberValidated("", View.VISIBLE);
+            }
         }
     }
 

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

@@ -19,6 +19,11 @@ public void onBanksListRetrieved(List<Bank> banks) {
 
     }
 
+    @Override
+    public void onPhoneNumberValidated(String phoneNumber, int visibility) {
+
+    }
+
     @Override
     public void showProgressIndicator(boolean active) {
 

rave_android/src/main/res/layout/rave_sdk_fragment_account.xml

@@ -77,6 +77,20 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
+            <EditText
+                android:id="@+id/rave_bankEditText"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="3dp"
+                android:layout_marginBottom="5dp"
+                android:layout_marginRight="20dp"
+                android:focusableInTouchMode="false"
+                android:longClickable="false"
+                android:hint="@string/bank"
+                android:inputType="numberDecimal" />
+
+
             <com.google.android.material.textfield.TextInputLayout
                 app:boxBackgroundColor="@null"
                 android:id="@+id/rave_accountNumberTil"
@@ -120,19 +134,6 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <EditText
-                android:id="@+id/rave_bankEditText"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="3dp"
-                android:layout_marginBottom="5dp"
-                android:layout_marginRight="20dp"
-                android:focusableInTouchMode="false"
-                android:longClickable="false"
-                android:hint="@string/bank"
-                android:inputType="numberDecimal" />
-
 
             <EditText
                 android:id="@+id/rave_dobEditText"