Merge branch 'verification_utils' into flwmaster

Author: jeremiahAI

app/build.gradle

@@ -35,4 +35,5 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
     implementation project(':rave_android')
+    implementation project(':rave_utils')
 }

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

@@ -3,11 +3,6 @@
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-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;
@@ -18,6 +13,11 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SwitchCompat;
+
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RaveUiManager;
 import com.flutterwave.raveandroid.data.Utils;
@@ -34,6 +34,7 @@
 import com.flutterwave.raveandroid.rave_presentation.card.SavedCardsListener;
 import com.flutterwave.raveandroid.rave_presentation.data.AddressDetails;
 import com.flutterwave.raveandroid.rave_remote.responses.SaveCardResponse;
+import com.flutterwave.raveutils.verification.RaveVerificationUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -372,8 +373,8 @@ private void validateEntries() {
 
                 cardPayManager = new CardPaymentManager(((RaveNonUIManager) raveManager), this, this);
                 card = new Card(
-                        "5531886652142950", // Test MasterCard PIN authentication
-//                        "4242424242424242", // Test VisaCard 3D-Secure Authentication
+//                        "5531886652142950", // Test MasterCard PIN authentication
+                        "4242424242424242", // Test VisaCard 3D-Secure Authentication
 //                        "4556052704172643", // Test VisaCard (Address Verification)
                         "12",
                         "30",
@@ -405,6 +406,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             } else if (resultCode == RavePayActivity.RESULT_CANCELLED) {
                 Toast.makeText(this, "CANCELLED " + message, Toast.LENGTH_SHORT).show();
             }
+        } else if (requestCode == RaveConstants.WEB_VERIFICATION_REQUEST_CODE) {
+            cardPayManager.onWebpageAuthenticationComplete();
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }
@@ -522,10 +525,11 @@ public void collectAddress() {
 
     @Override
     public void showAuthenticationWebPage(String authenticationUrl) {
-        Toast.makeText(this, "Called to load web page", Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "Loading auth web page", Toast.LENGTH_SHORT).show();
 
         // Load webpage
-//        cardPayManager.onWebpageAuthenticationComplete();
+        new RaveVerificationUtils(this, isLiveSwitch.isChecked(), publicKeyEt.getText().toString())
+                .showWebpageVerificationScreen(authenticationUrl);
     }
 
     @Override

app/src/main/res/values/styles.xml

@@ -40,7 +40,7 @@
     </style>
 
     <style name="otpBtnStyle2" parent="@android:style/Widget.Button">
-        <item name="android:background">@drawable/otp_button_curved</item>
+        <item name="android:background">@drawable/otp_button_curved_2</item>
         <item name="android:textColor">#009688</item>
     </style>
 

rave_android/build.gradle

@@ -64,6 +64,7 @@ dependencies {
     api project(path: ':rave_core')
     api project(path: ':rave_cache')
     implementation project(':rave_logger')
+    implementation project(':rave_utils')
     compile project(path: ':rave_presentation')
 
 

rave_android/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".verification.VerificationActivity"
+            android:name="com.flutterwave.raveutils.verification.VerificationActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".card.savedcards.SavedCardsActivity"

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

@@ -29,8 +29,6 @@
 import com.flutterwave.raveandroid.banktransfer.BankTransferFragment;
 import com.flutterwave.raveandroid.barter.BarterFragment;
 import com.flutterwave.raveandroid.card.CardFragment;
-import com.flutterwave.raveandroid.data.events.ScreenLaunchEvent;
-import com.flutterwave.raveandroid.data.events.ScreenMinimizeEvent;
 import com.flutterwave.raveandroid.data.events.SessionFinishedEvent;
 import com.flutterwave.raveandroid.di.components.DaggerRaveUiComponent;
 import com.flutterwave.raveandroid.di.components.RaveUiComponent;
@@ -43,6 +41,8 @@
 import com.flutterwave.raveandroid.rave_logger.Event;
 import com.flutterwave.raveandroid.rave_logger.EventLogger;
 import com.flutterwave.raveandroid.rave_logger.di.EventLoggerModule;
+import com.flutterwave.raveandroid.rave_logger.events.ScreenLaunchEvent;
+import com.flutterwave.raveandroid.rave_logger.events.ScreenMinimizeEvent;
 import com.flutterwave.raveandroid.rave_presentation.di.DaggerRaveComponent;
 import com.flutterwave.raveandroid.rave_presentation.di.RaveComponent;
 import com.flutterwave.raveandroid.rave_remote.di.RemoteModule;
@@ -93,9 +93,9 @@ public class RavePayActivity extends AppCompatActivity {
     private ConstraintLayout root;
 
 
-    public static int RESULT_SUCCESS = 111;
-    public static int RESULT_ERROR = 222;
-    public static int RESULT_CANCELLED = 333;
+    public static int RESULT_SUCCESS = RaveConstants.RESULT_SUCCESS;
+    public static int RESULT_ERROR = RaveConstants.RESULT_ERROR;
+    public static int RESULT_CANCELLED = RaveConstants.RESULT_CANCELLED;
     private int tileCount = 0;
     int theme;
     private float paymentTilesTextSize;