if save cards exists for a number,show the saved cards first.

Author: bolaware

rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java

@@ -18,17 +18,22 @@
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.flutterwave.raveandroid.R;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.ViewObject;
+import com.flutterwave.raveandroid.card.savedcards.SavedCardRecyclerAdapter;
 import com.flutterwave.raveandroid.card.savedcards.SavedCardsActivity;
 import com.flutterwave.raveandroid.card.savedcards.SavedCardsFragment;
 import com.flutterwave.raveandroid.data.EmailObfuscator;
@@ -40,6 +45,7 @@
 import com.flutterwave.raveandroid.rave_logger.events.StartTypingEvent;
 import com.flutterwave.raveandroid.rave_presentation.data.AddressDetails;
 import com.flutterwave.raveandroid.rave_presentation.data.events.ErrorEvent;
+import com.flutterwave.raveandroid.rave_remote.Callbacks;
 import com.flutterwave.raveandroid.rave_remote.responses.SaveCardResponse;
 import com.flutterwave.raveutils.verification.AVSVBVFragment;
 import com.flutterwave.raveutils.verification.OTPFragment;
@@ -53,6 +59,7 @@
 import java.lang.reflect.Type;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
@@ -125,6 +132,8 @@ public class CardFragment extends Fragment implements View.OnClickListener, Card
     private TextInputLayout saveCardPhoneNoTil;
     private String responseAsJsonString;
     private SavedCard selectedSavedCard;
+    private ScrollView newCardOverallLay;
+    private NestedScrollView savedCardOverallLay;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -176,6 +185,7 @@ private void setListeners() {
         cardExpiryTv.addTextChangedListener(new ExpiryWatcher());
         payButton.setOnClickListener(this);
         useASavedCardTv.setOnClickListener(this);
+        useAnotherCardTv.setOnClickListener(this);
 
         cardExpiryTv.setOnFocusChangeListener(this);
         cardNoTv.setOnFocusChangeListener(this);
@@ -237,8 +247,8 @@ private void initializeViews() {
         saveCardPhoneNoTil = (TextInputLayout) v.findViewById(R.id.save_card_phoneNoTil);
         saveCardEmailTil = (TextInputLayout) v.findViewById(R.id.save_card_emailTil);
         saveNewCardLayout = (LinearLayout) v.findViewById(R.id.rave_layout_for_saving_card);
-
-
+        newCardOverallLay = (ScrollView) v.findViewById(R.id.new_card_overall_lay);
+        savedCardOverallLay = (NestedScrollView) v.findViewById(R.id.saved_card_overall_lay);
     }
 
 
@@ -257,6 +267,19 @@ public void onClick(View view) {
                 collectDataForSavedCardCharge();
             }
         }
+        if(i == R.id.rave_use_new_card_tv){
+            switchToSaveCards(false);
+        }
+    }
+
+    private void switchToSaveCards(boolean switchToSaveCards){
+        if(switchToSaveCards){
+            savedCardOverallLay.setVisibility(VISIBLE);
+            newCardOverallLay.setVisibility(GONE);
+        } else {
+            savedCardOverallLay.setVisibility(GONE);
+            newCardOverallLay.setVisibility(VISIBLE);
+        }
     }
 
     private void collectDataForSavedCardCharge() {
@@ -496,20 +519,41 @@ public void showOTPLayoutForSavedCard(Payload payload, String authInstruction) {
 
     @Override
     public void showSavedCardsLayout(List<SavedCard> savedCardsList) {
-        Intent intent = new Intent(getContext(), SavedCardsActivity.class);
-        Type savedCardsListType = new TypeToken<List<SavedCard>>() {
-        }.getType();
-        intent.putExtra(SavedCardsFragment.EXTRA_SAVED_CARDS,
-                (new Gson()).toJson(savedCardsList, savedCardsListType));
-        intent.putExtra(SavedCardsActivity.ACTIVITY_MOTIVE, SavedCardsFragment.SAVED_CARD_MOTIVE);
-        startActivityForResult(intent, FOR_SAVED_CARDS);
+        switchToSaveCards(true);
+//        Intent intent = new Intent(getContext(), SavedCardsActivity.class);
+//        Type savedCardsListType = new TypeToken<List<SavedCard>>() {
+//        }.getType();
+//        intent.putExtra(SavedCardsFragment.EXTRA_SAVED_CARDS,
+//                (new Gson()).toJson(savedCardsList, savedCardsListType));
+//        intent.putExtra(SavedCardsActivity.ACTIVITY_MOTIVE, SavedCardsFragment.SAVED_CARD_MOTIVE);
+//        startActivityForResult(intent, FOR_SAVED_CARDS);
     }
 
     @Override
-    public void setHasSavedCards(boolean b) {
+    public void setHasSavedCards(boolean b, List<SavedCard> savedCards) {
         hasSavedCards = b;
-        if (b) useASavedCardTv.setVisibility(VISIBLE);
-        else useASavedCardTv.setVisibility(GONE);
+        switchToSaveCards(b);
+        if (b) {
+            useASavedCardTv.setVisibility(VISIBLE);
+            setUpSavedCardsAdapter(savedCards);
+        } else {
+            useASavedCardTv.setVisibility(GONE);
+        }
+    }
+
+    private void setUpSavedCardsAdapter(List<SavedCard> savedCards){
+        if (savedCards == null) savedCards = new ArrayList<>();
+        SavedCardRecyclerAdapter adapter = new SavedCardRecyclerAdapter();
+        adapter.set(savedCards);
+        adapter.setSavedCardSelectedListener(new Callbacks.SavedCardSelectedListener() {
+            @Override
+            public void onCardSelected(SavedCard savedCard) {
+                onSavedCardSelected(savedCard);
+            }
+        });
+        RecyclerView recyclerView = (RecyclerView) v.findViewById(R.id.rave_recycler);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerView.setAdapter(adapter);
     }
 
     /**

rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiContract.java

@@ -32,7 +32,7 @@ interface View extends CardContract.CardInteractor {
 
         void showCardSavingOption(boolean b);
 
-        void setHasSavedCards(boolean b);
+        void setHasSavedCards(boolean b, List<SavedCard> savedCards);
 
         void setSavedCardsLayoutVisibility(boolean showPhoneEmailFields);
     }

rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java

@@ -303,7 +303,7 @@ public void checkForSavedCardsInMemory(RavePayInitializer ravePayInitializer) {
         }
 
         if (!savedCards.isEmpty()) {
-            mView.setHasSavedCards(true);
+            mView.setHasSavedCards(true, savedCards);
         }
     }
 

rave_android/src/main/java/com/flutterwave/raveandroid/card/NullUiCardView.java

@@ -26,6 +26,11 @@ public void showProgressIndicator(boolean active) {
 
     }
 
+    @Override
+    public void setHasSavedCards(boolean b, List<SavedCard> savedCards) {
+
+    }
+
     @Override
     public void onCardSaveSuccessful(SaveCardResponse response, String phoneNumber) {
 
@@ -56,11 +61,6 @@ public void showSavedCardsLayout(List<SavedCard> savedCardsList) {
 
     }
 
-    @Override
-    public void setHasSavedCards(boolean b) {
-
-    }
-
     @Override
     public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
 

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

@@ -9,6 +9,7 @@
     tools:context=".card.CardFragment">
 
     <ScrollView
+        android:id="@+id/new_card_overall_lay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true">
@@ -279,5 +280,10 @@
     </ScrollView>
 
 
+    <include
+        android:id="@+id/saved_card_overall_lay"
+        android:visibility="gone" layout="@layout/rave_sdk_pick_saved_card_layout"/>
+
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>