Merge pull request #174 from jeremiahVaris/update-layout-names

Rename layouts to have unique names

Author: bolaware

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

@@ -369,7 +369,7 @@ private void addVendorDialog() {
         final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
         // ...Irrelevant code for customizing the buttons and title
         LayoutInflater inflater = this.getLayoutInflater();
-        View dialogView = inflater.inflate(R.layout.add_vendor_layout, null);
+        View dialogView = inflater.inflate(R.layout.rave_sdk_add_vendor_layout, null);
         dialogBuilder.setView(dialogView);
         final EditText vendorReferenceET = dialogView.findViewById(R.id.vendorReferecnceET);
         final EditText vendorRatioET = dialogView.findViewById(R.id.vendorRatioET);

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

@@ -103,7 +103,7 @@ public class RavePayActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_rave_pay);
+        setContentView(R.layout.rave_sdk_activity_rave_pay);
         root = findViewById(R.id.rave_pay_activity_rootview);
 
         try {
@@ -200,7 +200,7 @@ private void render(boolean animated) {
             // Set title view
             View titleView = root.findViewById(R.id.title_container);
             if (titleView == null) {
-                titleView = getLayoutInflater().inflate(R.layout.rave_payment_title_layout, root, false);
+                titleView = getLayoutInflater().inflate(R.layout.rave_sdk_payment_title_layout, root, false);
                 root.addView(titleView);
             }
             set.connect(titleView.getId(), ConstraintSet.TOP, root.getId(), ConstraintSet.TOP);
@@ -315,7 +315,7 @@ private void displayPaymentFragment(final PaymentTile foundPaymentTile) {
         if (fragmentContainerLayout == null) {
             fragmentContainerLayout
                     = getLayoutInflater()
-                    .inflate(R.layout.payment_fragment_container_layout, root, false);
+                    .inflate(R.layout.rave_sdk_payment_fragment_container_layout, root, false);
 
             root.addView(fragmentContainerLayout);
             fragmentContainerLayout
@@ -569,7 +569,7 @@ private void addPaymentType(int paymentType) {
     }
 
     private View createPaymentTileView(String title) {
-        View tileView = getLayoutInflater().inflate(R.layout.payment_type_tile_layout, root, false);
+        View tileView = getLayoutInflater().inflate(R.layout.rave_sdk_payment_type_tile_layout, root, false);
         TextView tv2 = tileView.findViewById(R.id.rave_payment_type_title_textView);
         tileView.setId(ViewCompat.generateViewId());
         String fullTitle = "Pay with " + title;

raveandroid/src/main/java/com/flutterwave/raveandroid/WebFragment.java

@@ -49,7 +49,7 @@ public WebFragment() {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        View v = inflater.inflate(R.layout.fragment_web, container, false);
+        View v = inflater.inflate(R.layout.rave_sdk_fragment_web, container, false);
         webView = v.findViewById(R.id.rave_webview);
         authurl = getArguments().getString(EXTRA_AUTH_URL);
         onDisplayInternetBankingPage(authurl);

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

@@ -94,7 +94,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         injectComponents();
 
-        v = inflater.inflate(R.layout.fragment_account, container, false);
+        v = inflater.inflate(R.layout.rave_sdk_fragment_account, container, false);
 
         initializeViews();
 
@@ -350,7 +350,7 @@ public void showBanks(List<Bank> banks) {
             bottomSheetDialog = new BottomSheetDialog(getActivity());
 
             LayoutInflater inflater = LayoutInflater.from(getActivity());
-            View v = inflater.inflate(R.layout.add_exisiting_bank, null, false);
+            View v = inflater.inflate(R.layout.rave_sdk_add_exisiting_bank, null, false);
             RecyclerView recyclerView = v.findViewById(R.id.rave_recycler);
 
             BanksRecyclerAdapter adapter = new BanksRecyclerAdapter();

raveandroid/src/main/java/com/flutterwave/raveandroid/account/BanksRecyclerAdapter.java

@@ -32,7 +32,7 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         Context context = parent.getContext();
         LayoutInflater inflater = LayoutInflater.from(context);
 
-        View v = inflater.inflate(R.layout.select_bank_list_item, parent, false);
+        View v = inflater.inflate(R.layout.rave_sdk_select_bank_list_item, parent, false);
         return new ViewHolder(v);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java

@@ -58,7 +58,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         injectComponents();
 
-        v = inflater.inflate(R.layout.fragment_ach, container, false);
+        v = inflater.inflate(R.layout.rave_sdk_fragment_ach, container, false);
 
         initializeViews();
 

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

@@ -79,7 +79,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             presenter.restoreState(savedInstanceState);
         }
 
-        v = inflater.inflate(R.layout.fragment_bank_transfer, container, false);
+        v = inflater.inflate(R.layout.rave_sdk_fragment_bank_transfer, container, false);
 
         initializeViews();
 

raveandroid/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java

@@ -70,7 +70,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         injectComponents();
 
-        v = inflater.inflate(R.layout.fragment_barter, container, false);
+        v = inflater.inflate(R.layout.rave_sdk_fragment_barter, container, false);
 
         initializeViews();
 

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

@@ -137,7 +137,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         injectComponents();
 
-        v = inflater.inflate(R.layout.fragment_card, container, false);
+        v = inflater.inflate(R.layout.rave_sdk_fragment_card, container, false);
 
         initializeViews();
 

raveandroid/src/main/java/com/flutterwave/raveandroid/card/SavedCardRecyclerAdapter.java

@@ -33,7 +33,7 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         Context context = parent.getContext();
         LayoutInflater inflater = LayoutInflater.from(context);
 
-        View v = inflater.inflate(R.layout.card_preview_item, parent, false);
+        View v = inflater.inflate(R.layout.rave_sdk_card_preview_item, parent, false);
         return new ViewHolder(v);
     }