add credit card icon to payment credentials list and fix payment options view not updating when adding a creditcard via datatrans

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.43.2]
+
+### Added
+- Added an icon to the payment credentials list empty state
+
+### Fixed
+- PaymentOptionsView not updating when adding a credit card via datatrans
+
 ## [0.43.1]
 
 ### Fixed

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.43.1'
+        sdkVersion='0.43.2'
         versionCode=1
 
         compileSdkVersion=30

ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java

@@ -46,6 +46,7 @@ public class PaymentCredentialsListView extends FrameLayout implements PaymentCr
     private RecyclerView recyclerView;
     private List<PaymentCredentials.Type> types;
     private Project project;
+    private View emptyState;
 
     public PaymentCredentialsListView(Context context) {
         super(context);
@@ -117,6 +118,8 @@ public void click() {
                 }
             }
         });
+
+        emptyState = findViewById(R.id.empty_state);
     }
 
     public void show(List<PaymentCredentials.Type> types, Project project) {
@@ -202,6 +205,14 @@ public void onChanged() {
         }
 
         recyclerView.getAdapter().notifyDataSetChanged();
+
+        if (entries.size() == 0) {
+            emptyState.setVisibility(View.VISIBLE);
+            recyclerView.setVisibility(View.GONE);
+        } else {
+            emptyState.setVisibility(View.GONE);
+            recyclerView.setVisibility(View.VISIBLE);
+        }
     }
 
     private int getDrawableForBrand(PaymentCredentials.Brand brand) {
@@ -229,74 +240,52 @@ private int getDrawableForBrand(PaymentCredentials.Brand brand) {
         return drawableResId;
     }
 
-    private class Adapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-        private final static int TYPE_EMPTYSTATE = 0;
-        private final static int TYPE_ENTRY = 1;
-
-        @Override
-        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            if (viewType == TYPE_EMPTYSTATE) {
-                View v = LayoutInflater.from(getContext()).inflate(R.layout.snabble_item_payment_credentials_list_emptystate, parent, false);
-                return new EmptyStateViewHolder(v);
-            } else {
-                View v = LayoutInflater.from(getContext()).inflate(R.layout.snabble_item_payment_credentials_list_entry, parent, false);
-                return new EntryViewHolder(v);
-            }
-        }
-
+    private class Adapter extends RecyclerView.Adapter<EntryViewHolder> {
         @Override
-        public int getItemViewType(int position) {
-            if (entries.size() == 0) {
-                return TYPE_EMPTYSTATE;
-            }
-
-            return TYPE_ENTRY;
+        public EntryViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View v = LayoutInflater.from(getContext()).inflate(R.layout.snabble_item_payment_credentials_list_entry, parent, false);
+            return new EntryViewHolder(v);
         }
 
         @Override
-        public void onBindViewHolder(final RecyclerView.ViewHolder holder, final int position) {
-            int type = getItemViewType(position);
-
-            if (type == TYPE_ENTRY) {
-                EntryViewHolder vh = (EntryViewHolder) holder;
-                final Entry e = entries.get(position);
+        public void onBindViewHolder(final EntryViewHolder vh, final int position) {
+            final Entry e = entries.get(position);
 
-                if (e.drawableRes != 0) {
-                    vh.icon.setImageResource(e.drawableRes);
-                    vh.icon.setVisibility(View.VISIBLE);
-                } else {
-                    vh.icon.setVisibility(View.INVISIBLE);
-                }
-
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/yyyy");
-                String validTo = simpleDateFormat.format(e.paymentCredentials.getValidTo());
-
-                if (e.paymentCredentials.getValidTo() != 0) {
-                    vh.validTo.setText(getResources().getString(R.string.Snabble_Payment_CreditCard_expireDate, validTo));
-                    vh.validTo.setVisibility(View.VISIBLE);
-                } else {
-                    vh.validTo.setVisibility(View.GONE);
-                }
+            if (e.drawableRes != 0) {
+                vh.icon.setImageResource(e.drawableRes);
+                vh.icon.setVisibility(View.VISIBLE);
+            } else {
+                vh.icon.setVisibility(View.INVISIBLE);
+            }
 
-                vh.text.setText(e.text);
-                vh.delete.setOnClickListener(view -> {
-                    new AlertDialog.Builder(getContext())
-                            .setMessage(R.string.Snabble_Payment_delete_message)
-                            .setPositiveButton(R.string.Snabble_Yes, (dialog, which) -> {
-                                paymentCredentialsStore.remove(e.paymentCredentials);
-                            })
-                            .setNegativeButton(R.string.Snabble_No, null)
-                            .create()
-                            .show();
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/yyyy");
+            String validTo = simpleDateFormat.format(e.paymentCredentials.getValidTo());
 
-                    Telemetry.event(Telemetry.Event.PaymentMethodDeleted, e.paymentCredentials.getType());
-                });
+            if (e.paymentCredentials.getValidTo() != 0) {
+                vh.validTo.setText(getResources().getString(R.string.Snabble_Payment_CreditCard_expireDate, validTo));
+                vh.validTo.setVisibility(View.VISIBLE);
+            } else {
+                vh.validTo.setVisibility(View.GONE);
             }
+
+            vh.text.setText(e.text);
+            vh.delete.setOnClickListener(view -> {
+                new AlertDialog.Builder(getContext())
+                        .setMessage(R.string.Snabble_Payment_delete_message)
+                        .setPositiveButton(R.string.Snabble_Yes, (dialog, which) -> {
+                            paymentCredentialsStore.remove(e.paymentCredentials);
+                        })
+                        .setNegativeButton(R.string.Snabble_No, null)
+                        .create()
+                        .show();
+
+                Telemetry.event(Telemetry.Event.PaymentMethodDeleted, e.paymentCredentials.getType());
+            });
         }
 
         @Override
         public int getItemCount() {
-            return Math.max(1, entries.size());
+            return entries.size();
         }
     }
 

ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt

@@ -43,7 +43,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
         adapter.submitList(getEntries())
 
         val listener = PaymentCredentialsStore.Callback {
-            adapter.notifyDataSetChanged()
+            adapter.submitList(getEntries())
         }
 
         Snabble.getInstance().paymentCredentialsStore.addCallback(listener)