Improved search view for more visual clarity & better i18n pull script

Author: ajungg

.gitignore

@@ -237,5 +237,5 @@ sample/src/main/assets/products.major
 sample/src/main/assets/products.minor
 sample/src/main/assets/products.sqlite3
 sample/src/main/assets/metadata.json
-ui/src/main/res/values/strings.xml
+
 maven-repository

build.gradle

@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.8.0'
+        sdkVersion='0.8.1'
         versionCode=1
 
         compileSdkVersion=27

core/src/main/java/io/snabble/sdk/Checkout.java

@@ -327,9 +327,6 @@ public void onResponse(Call call, Response response) throws IOException {
                     String json = IOUtils.toString(inputStream, Charset.forName("UTF-8"));
                     signedCheckoutInfo = gson.fromJson(json, SignedCheckoutInfo.class);
 
-                    Logger.d("Local price: " + shoppingCart.getTotalPrice()
-                            + ", Remote price: " + signedCheckoutInfo.checkoutInfo.get("price"));
-
                     if(signedCheckoutInfo.checkoutInfo.has("price")
                             && signedCheckoutInfo.checkoutInfo.get("price").getAsJsonObject().has("price")) {
                         priceToPay = signedCheckoutInfo.checkoutInfo
@@ -343,7 +340,7 @@ public void onResponse(Call call, Response response) throws IOException {
 
                     if(priceToPay != shoppingCart.getTotalPrice()){
                         Logger.w("Warning local price is different from remotely calculated price! (Local: "
-                                + shoppingCart.getTotalPrice() + ", Remote: " + priceToPay);
+                                + shoppingCart.getTotalPrice() + ", Remote: " + priceToPay + ")");
                     }
 
                     PaymentMethod[] availablePaymentMethods = getAvailablePaymentMethods();

i18n/Snabble.twine

@@ -1,2 +1,7 @@
 #!/bin/bash
-git subtree pull --prefix i18n https://github.com/snabble/SDK-i18n master --squash
+git clone --depth=1 [email protected]:snabble/SDK-i18n.git i18ntemp
+
+twine generate-all-localization-files i18ntemp/Snabble.twine ui/src/main/res/ --tags android --untagged --format android
+
+rm -rf i18ntemp
+git add ui/src/main/res/values/strings.xml

pull-i18n.sh

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply from: '../scripts/findbugs.gradle'
-apply from: '../scripts/i18n.gradle'
 
 android {
     compileSdkVersion project.compileSdkVersion

scripts/i18n.gradle

@@ -9,7 +9,6 @@
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.TextView;
@@ -21,10 +20,11 @@
 import io.snabble.sdk.ui.telemetry.Telemetry;
 
 public class ProductSearchView extends FrameLayout {
-    private RecyclerView recyclerView;
     private SearchableProductAdapter searchableProductAdapter;
     private EditText searchBar;
     private boolean searchBarEnabled;
+    private TextView addCodeAsIs;
+    private String lastSearchQuery;
 
     public ProductSearchView(Context context) {
         super(context);
@@ -44,7 +44,9 @@ public ProductSearchView(Context context, AttributeSet attrs, int defStyleAttr)
     private void inflateView() {
         inflate(getContext(), R.layout.view_search_product, this);
 
-        recyclerView = findViewById(R.id.recycler_view);
+        SnabbleSdk sdkInstance = SnabbleUI.getSdkInstance();
+
+        RecyclerView recyclerView = findViewById(R.id.recycler_view);
         searchBar = findViewById(R.id.search_bar);
         searchBar.addTextChangedListener(new TextWatcher() {
             @Override
@@ -59,7 +61,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
 
             @Override
             public void afterTextChanged(Editable s) {
-                searchableProductAdapter.search(s.toString());
+                search(s.toString());
             }
         });
 
@@ -84,13 +86,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
             }
         });
 
-        setSdkInstance(SnabbleUI.getSdkInstance());
-    }
-
-    public void setSdkInstance(SnabbleSdk sdkInstance) {
-        if (sdkInstance == null) {
-            return;
-        }
+        addCodeAsIs = findViewById(R.id.add_code_as_is);
 
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         searchableProductAdapter = new SearchableProductAdapter(sdkInstance.getProductDatabase());
@@ -99,17 +95,36 @@ public void setSdkInstance(SnabbleSdk sdkInstance) {
         searchableProductAdapter.setOnProductSelectedListener(new OnProductSelectedListener() {
             @Override
             public void onProductSelected(String scannableCode) {
-                Telemetry.event(Telemetry.Event.ManuallyEnteredProduct, scannableCode);
+                showScannerWithCode(scannableCode);
+            }
+        });
 
-                SnabbleUICallback callback = SnabbleUI.getUiCallback();
-                if (callback != null) {
-                    callback.showScannerWithCode(scannableCode);
-                }
+        searchableProductAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onChanged() {
+                onSearchUpdated();
+            }
+        });
+
+        addCodeAsIs.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showScannerWithCode(lastSearchQuery);
             }
         });
+
         recyclerView.setAdapter(searchableProductAdapter);
     }
 
+    private void showScannerWithCode(String scannableCode) {
+        Telemetry.event(Telemetry.Event.ManuallyEnteredProduct, scannableCode);
+
+        SnabbleUICallback callback = SnabbleUI.getUiCallback();
+        if (callback != null) {
+            callback.showScannerWithCode(scannableCode);
+        }
+    }
+
     public void setSearchBarEnabled(boolean searchBarEnabled) {
         this.searchBarEnabled = searchBarEnabled;
 
@@ -125,22 +140,17 @@ public void search(String searchQuery) {
             searchBar.setText(searchQuery);
         }
 
+        lastSearchQuery = searchQuery;
         searchableProductAdapter.search(searchQuery);
     }
 
-
-    public void show() {
-        setVisibility(View.VISIBLE);
-        searchBar.setText("");
-
-        if (searchBar.requestFocus()) {
-            InputMethodManager imm = (InputMethodManager) getContext()
-                    .getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.showSoftInput(searchBar, InputMethodManager.SHOW_IMPLICIT);
+    private void onSearchUpdated() {
+        if(searchableProductAdapter.getItemCount() == 0
+                && lastSearchQuery != null && lastSearchQuery.length() > 0){
+            addCodeAsIs.setText(getResources().getString(R.string.Snabble_Scanner_addCodeAsIs, lastSearchQuery));
+            addCodeAsIs.setVisibility(View.VISIBLE);
+        } else {
+            addCodeAsIs.setVisibility(View.GONE);
         }
     }
-
-    public void hide() {
-        setVisibility(View.GONE);
-    }
 }

ui/build.gradle

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="15dp" />
+    <size
+        android:width="343dp"
+        android:height="57dp" />
+    <solid android:color="#FFFFFFFF" />
+</shape>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="15dp" />
+    <size
+        android:width="343dp"
+        android:height="57dp" />
+    <solid android:color="#FFFFFFFF" />
+    <stroke
+        android:color="#1A000000"
+        android:width="1.25dp" />
+</shape>