add option to show sku in product search view

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.16.2]
+
+### Added
+- Option to show the product sku in ProductSearchView
+
 ## [0.16.1]
 
 ### Changed

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.16.1'
+        sdkVersion='0.16.2'
         versionCode=1
 
         compileSdkVersion=28

ui/src/main/java/io/snabble/sdk/ui/search/ProductSearchView.java

@@ -30,6 +30,8 @@ public class ProductSearchView extends FrameLayout {
     private String lastSearchQuery;
     private boolean allowAnyCode;
     private OnProductSelectedListener onProductSelectedListener;
+    private boolean showSku;
+    private boolean showBarcode;
 
     public ProductSearchView(Context context) {
         super(context);
@@ -100,6 +102,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         searchableProductAdapter = new SearchableProductAdapter();
         searchableProductAdapter.setShowBarcode(true);
+        searchableProductAdapter.setShowSku(showSku);
         searchableProductAdapter.setSearchType(SearchableProductAdapter.SearchType.BARCODE);
         searchableProductAdapter.setOnProductSelectedListener(new OnProductSelectedListener() {
             @Override
@@ -189,4 +192,14 @@ public void setAllowAnyCode(boolean allowAnyCode) {
     public void setOnProductSelectedListener(OnProductSelectedListener onProductSelectedListener) {
         this.onProductSelectedListener = onProductSelectedListener;
     }
+
+    public void setShowSku(boolean showSku) {
+        this.showSku = showSku;
+        searchableProductAdapter.setShowSku(showSku);
+    }
+
+    public void setShowBarcode(boolean showBarcode) {
+        this.showBarcode = showBarcode;
+        searchableProductAdapter.setShowBarcode(showBarcode);
+    }
 }

ui/src/main/java/io/snabble/sdk/ui/search/SearchableProductAdapter.java

@@ -2,6 +2,7 @@
 
 
 import android.database.Cursor;
+import android.graphics.Typeface;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -10,6 +11,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -46,6 +48,7 @@ public enum SearchType {
     private boolean showBarcode = true;
     private String lastQuery = "";
     private Project project;
+    private boolean showSku;
 
     public SearchableProductAdapter() {
         this.project = SnabbleUI.getProject();
@@ -107,6 +110,8 @@ public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, final int
             selectedCode = scannableCodes[0];
         }
 
+        SpannableStringBuilder ssb = new SpannableStringBuilder();
+
         if (showBarcode) {
             for (Product.Code code : product.getScannableCodes()) {
                 String lookupCode = code.lookupCode;
@@ -116,11 +121,25 @@ public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, final int
                     }
 
                     Spannable spannable = highlight(lastQuery, lookupCode);
-                    holder.code.setText(spannable);
+                    ssb.append(spannable);
                     selectedCode = code;
                     break;
                 }
             }
+        }
+
+        if (showSku) {
+            if (ssb.length() > 0) {
+                ssb.append(" (");
+                ssb.append(product.getSku());
+                ssb.append(")");
+            } else {
+                ssb.append(product.getSku());
+            }
+        }
+
+        if (ssb.length() > 0) {
+            holder.code.setText(ssb);
         } else {
             holder.code.setVisibility(View.GONE);
         }
@@ -144,6 +163,10 @@ public void setSearchType(SearchType type) {
         searchType = type;
     }
 
+    public void setShowSku(boolean showSku) {
+        this.showSku = showSku;
+    }
+
     public void setOnProductSelectedListener(OnProductSelectedListener productSelectedListener) {
         this.productSelectedListener = productSelectedListener;
     }
@@ -215,7 +238,7 @@ private SpannableString highlight(final String query, final String text) {
                         break;
                     }
                     final StyleSpan styleSpan = new StyleSpan(android.graphics.Typeface.BOLD);
-                    sb.setSpan(styleSpan, lastIndex, lastIndex + q.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+                    sb.setSpan(styleSpan, lastIndex, lastIndex + q.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
                     lastIndex += q.length();
                 }
             }