improved encoded codes screen

ajungg · ajungg · commit 995d8785df4d · 2019-07-10T14:02:39.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.14.7]
+
+### Changes
+- Added support for encodedCodes 'maxChars' property
+- Layout and Behaviour improvements to the encodedCodes screen
+- Renamed key Snabble.Receipt.noReceipt to Snabble.Receipts.noReceipt 
+
+### New String Keys
+- Snabble.QRCode.entry.title
+- Snabble.Receipts.noReceipt
+
 ## [0.14.6]
 
 ### Fixed
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.14.6'
+        sdkVersion='0.14.7'
         versionCode=1
 
         compileSdkVersion=28
diff --git a/ui/build.gradle b/ui/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     implementation project(':utils')
     implementation project(':core')
 
-    implementation 'androidx.core:core:1.0.1'
+    implementation 'androidx.core:core:1.0.2'
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java
@@ -5,16 +5,17 @@
 import android.os.Looper;
 import androidx.annotation.NonNull;
 import android.util.DisplayMetrics;
-import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.util.ArrayList;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
 import androidx.recyclerview.widget.RecyclerView;
 import io.snabble.sdk.Checkout;
 import io.snabble.sdk.Project;
@@ -23,19 +24,20 @@
 import io.snabble.sdk.encodedcodes.EncodedCodesOptions;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
-import io.snabble.sdk.ui.SnabbleUICallback;
 import io.snabble.sdk.BarcodeFormat;
+import io.snabble.sdk.ui.SnabbleUICallback;
 import io.snabble.sdk.ui.scanner.BarcodeView;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.OneShotClickListener;
 
 class CheckoutEncodedCodesView extends FrameLayout implements View.OnLayoutChangeListener {
     private FrameLayout scrollContainer;
-    private TextView explanationText;
     private TextView explanationText2;
     private Project project;
     private EncodedCodesGenerator encodedCodesGenerator;
+    private CodeListView codeListView;
     private int maxSizeMm;
+    private Button paidButton;
 
     public CheckoutEncodedCodesView(Context context) {
         super(context);
@@ -56,38 +58,38 @@ private void inflateView(EncodedCodesOptions options) {
 
         scrollContainer = findViewById(R.id.scroll_container);
 
-        explanationText = findViewById(R.id.explanation1);
         explanationText2 = findViewById(R.id.explanation2);
 
         maxSizeMm = options.maxSizeMm;
         encodedCodesGenerator = new EncodedCodesGenerator(options);
 
-        final Button paidButton = findViewById(R.id.paid);
-
-        paidButton.setVisibility(View.INVISIBLE);
-        paidButton.setAlpha(0);
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                paidButton.setVisibility(View.VISIBLE);
-                paidButton.animate().setDuration(150).alpha(1).start();
-                paidButton.setEnabled(true);
-            }
-        }, 5000);
-
+        paidButton = findViewById(R.id.paid);
         paidButton.setOnClickListener(new OneShotClickListener() {
             @Override
             public void click() {
-                Project project = SnabbleUI.getProject();
-                project.getCheckout().approveOfflineMethod();
+                if (isAtLastBarcode()) {
+                    Project project = SnabbleUI.getProject();
+                    project.getCheckout().approveOfflineMethod();
 
-                SnabbleUICallback uiCallback = SnabbleUI.getUiCallback();
-                if (uiCallback != null) {
-                    uiCallback.goBack();
-                }
+                    SnabbleUICallback uiCallback = SnabbleUI.getUiCallback();
+                    if (uiCallback != null) {
+                        uiCallback.goBack();
+                    }
 
-                Telemetry.event(Telemetry.Event.CheckoutFinishByUser);
+                    Telemetry.event(Telemetry.Event.CheckoutFinishByUser);
+                } else {
+                    final LinearLayoutManager linearLayoutManager = (LinearLayoutManager) codeListView.getLayoutManager();
+                    RecyclerView.SmoothScroller smoothScroller = new LinearSmoothScroller(getContext()) {
+                        @Override
+                        protected int getVerticalSnapPreference() {
+                            return SNAP_TO_START;
+                        }
+                    };
+
+                    int scrollTo = getNextBarcodeIndex();
+                    smoothScroller.setTargetPosition(scrollTo);
+                    linearLayoutManager.startSmoothScroll(smoothScroller);
+                }
             }
         });
 
@@ -106,20 +108,22 @@ public void click() {
         }
     }
 
-    private void updateExplanationText(int codeCount) {
-        int resId;
-        if (codeCount > 1) {
-            resId = R.string.Snabble_QRCode_showTheseCodes;
-        } else {
-            resId = R.string.Snabble_QRCode_showThisCode;
+    public int getNextBarcodeIndex() {
+        final LinearLayoutManager linearLayoutManager = (LinearLayoutManager) codeListView.getLayoutManager();
+        if (linearLayoutManager != null) {
+            return linearLayoutManager.findLastVisibleItemPosition();
         }
 
-        if (SnabbleUI.getActionBar() != null) {
-            explanationText.setVisibility(View.GONE);
-            SnabbleUI.getActionBar().setTitle(resId);
-        } else {
-            explanationText.setText(resId);
+        return 0;
+    }
+
+    public boolean isAtLastBarcode() {
+        final LinearLayoutManager linearLayoutManager = (LinearLayoutManager) codeListView.getLayoutManager();
+        if (linearLayoutManager != null) {
+            return linearLayoutManager.findLastCompletelyVisibleItemPosition() == linearLayoutManager.getItemCount() - 1;
         }
+
+        return true;
     }
 
     @Override
@@ -146,19 +150,37 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom,
             handler.post(new Runnable() {
                 @Override
                 public void run() {
+                    DisplayMetrics dm = getResources().getDisplayMetrics();
+
                     if (scrollContainer.getWidth() > 0 && scrollContainer.getHeight() > 0) {
                         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
                                 ViewGroup.LayoutParams.MATCH_PARENT,
-                                ViewGroup.LayoutParams.WRAP_CONTENT);
-                        lp.gravity = Gravity.CENTER;
+                                ViewGroup.LayoutParams.MATCH_PARENT);
+
                         scrollContainer.removeAllViews();
-                        scrollContainer.addView(new CodeListView(getContext()), lp);
+                        codeListView = new CodeListView(getContext());
+                        scrollContainer.addView(codeListView, lp);
+                        codeListView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+                            @Override
+                            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                                super.onScrolled(recyclerView, dx, dy);
+
+                                CodeListViewAdapter adapter = ((CodeListViewAdapter)codeListView.getAdapter());
+                                if (isAtLastBarcode()) {
+                                    paidButton.setText(R.string.Snabble_QRCode_didPay);
+                                } else {
+                                    paidButton.setText(getResources().getString(R.string.Snabble_QRCode_nextCode,
+                                            getNextBarcodeIndex() + 1, adapter.getItemCount()));
+                                }
+                            }
+                        });
+
+                        codeListView.setPadding(0, (int) (12 * dm.density), 0, 0);
+                        codeListView.setOverScrollMode(View.OVER_SCROLL_NEVER);
                     }
 
-                    DisplayMetrics dm = getResources().getDisplayMetrics();
                     int dpHeight = Math.round(scrollContainer.getHeight() / dm.density);
                     if (dpHeight < 220) {
-                        explanationText.setVisibility(View.GONE);
                         explanationText2.setVisibility(View.GONE);
                     }
                 }
@@ -176,12 +198,18 @@ public CodeListView(@NonNull Context context) {
     }
 
     private class ViewHolder extends RecyclerView.ViewHolder {
+        BarcodeView barcodeView;
+        TextView title;
+
         ViewHolder(@NonNull View itemView) {
             super(itemView);
+
+            barcodeView = itemView.findViewById(R.id.barcode);
+            title = itemView.findViewById(R.id.title);
         }
     }
 
-    private class CodeListViewAdapter extends RecyclerView.Adapter {
+    private class CodeListViewAdapter extends RecyclerView.Adapter<ViewHolder> {
         private ArrayList<String> codes;
 
         CodeListViewAdapter() {
@@ -193,41 +221,61 @@ private class CodeListViewAdapter extends RecyclerView.Adapter {
 
             encodedCodesGenerator.add(project.getShoppingCart());
             codes = encodedCodesGenerator.generate();
-            updateExplanationText(codes.size());
         }
 
         @NonNull
         @Override
-        public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            return new ViewHolder(new BarcodeView(getContext()));
+        public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new ViewHolder(View.inflate(getContext(), R.layout.snabble_item_encodedcodes, null));
         }
 
         @Override
-        public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-            BarcodeView barcodeView = (BarcodeView)holder.itemView;
+        public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+            boolean smallScreen = explanationText2.getVisibility() == View.GONE;
+            DisplayMetrics dm = getResources().getDisplayMetrics();
+
+            holder.itemView.setLayoutParams(new LinearLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT));
+
+            if (position == 0) {
+                if (codes.size() > 1) {
+                    holder.title.setText(getResources().getString(R.string.Snabble_QRCode_showTheseCodes, getItemCount()));
+                } else {
+                    holder.title.setText(R.string.Snabble_QRCode_showThisCode);
+                }
+            } else {
+                if (explanationText2.getVisibility() == View.GONE) {
+                    holder.title.setVisibility(View.GONE);
+                } else {
+                    holder.title.setVisibility(View.VISIBLE);
+                    holder.title.setText(getResources().getString(R.string.Snabble_QRCode_entry_title, (position + 1)));
+                }
+            }
 
-            int h = scrollContainer.getHeight();
-            int barcodeHeight = codes.size() == 1 ? h : h - h / 5;
+            int offsetH = holder.title.getVisibility() != View.GONE ? (int) (48 * dm.density) : 0;
+            int h = scrollContainer.getHeight() - offsetH;
+            int barcodeHeight = codes.size() == 1 ? h : h - (smallScreen ? 0 : h / 4);
 
             if (maxSizeMm > 0) {
-                DisplayMetrics dm = getResources().getDisplayMetrics();
                 float pixelsPerMmX = dm.xdpi / 25.4f;
                 int size = (int) (pixelsPerMmX * maxSizeMm);
                 size = Math.min(barcodeHeight, size);
 
-                barcodeView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, size));
+                holder.barcodeView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, size));
             } else {
-                barcodeView.setLayoutParams(new RecyclerView.LayoutParams(
+                holder.barcodeView.setLayoutParams(new LinearLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         barcodeHeight));
             }
 
-            barcodeView.setFormat(BarcodeFormat.QR_CODE);
-
-            int padding = Math.round(12.0f * getResources().getDisplayMetrics().density);
-            barcodeView.setPadding(padding, padding, padding, padding);
+            if (!smallScreen) {
+                int padding = Math.round(12.0f * getResources().getDisplayMetrics().density);
+                holder.barcodeView.setPadding(padding, padding, padding, padding);
+            }
 
-            barcodeView.setText(codes.get(position));
+            holder.barcodeView.setFormat(BarcodeFormat.QR_CODE);
+            holder.barcodeView.setText(codes.get(position));
         }
 
         @Override
diff --git a/ui/src/main/res/layout/snabble_item_encodedcodes.xml b/ui/src/main/res/layout/snabble_item_encodedcodes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <TextView android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/Snabble.QRCode.showThisCode"
+        android:textColor="@color/snabble_textColorDark"
+        android:textStyle="bold"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
+        android:textSize="17sp" />
+
+    <io.snabble.sdk.ui.scanner.BarcodeView android:id="@+id/barcode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
+
diff --git a/ui/src/main/res/layout/snabble_view_checkout_encodedcodes.xml b/ui/src/main/res/layout/snabble_view_checkout_encodedcodes.xml
@@ -5,26 +5,10 @@
     android:layout_height="match_parent"
     android:background="#ffffff">
 
-
-    <TextView
-        android:id="@+id/explanation1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentTop="true"
-        android:text="@string/Snabble.QRCode.showThisCode"
-        android:textColor="@color/snabble_textColorDark"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp"
-        android:textSize="17sp" />
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/pay_amount"
-        android:layout_below="@+id/explanation1"
         android:minHeight="200dp"
         android:id="@+id/scroll_container">
 
@@ -58,11 +42,14 @@
         android:layout_marginBottom="16dp"
         android:textSize="14sp" />
 
-    <Button style="@style/SnabbleButton.TextButton"
+    <Button style="@style/SnabbleButton"
         android:id="@+id/paid"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:layout_marginBottom="12dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:text="@string/Snabble.QRCode.didPay" />
 </RelativeLayout>
diff --git a/ui/src/main/res/layout/snabble_view_receipt_list.xml b/ui/src/main/res/layout/snabble_view_receipt_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -21,5 +20,5 @@
         android:textSize="17sp"
         android:id="@+id/empty_state"
         android:visibility="gone"
-        android:text="@string/Snabble.Receipt.noReceipt"/>
+        android:text="@string/Snabble.Receipts.noReceipt"/>
 </merge>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ allprojects {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`project.ext {`
`26`		`- sdkVersion='0.14.6'`
	`26`	`+ sdkVersion='0.14.7'`
`27`	`27`	`versionCode=1`
`28`	`28`
`29`	`29`	`compileSdkVersion=28`