- improved checkout status layout

ajungg · ajungg · commit 9f3a0da6ece9 · 2019-02-12T16:50:54.000+01:00
- now using android:listDivider attribute for dividers
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.12.2]
+
+### Changed
+- Improved layout of checkout status screen
+- List dividers are now using the style attribute android:listDivider
+- The color snabble_dividerColor is removed
+
 ## [0.12.1]
 
 ### Fixed
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.12.1'
+        sdkVersion='0.12.2'
         versionCode=1
 
         compileSdkVersion=28
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java b/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java
@@ -127,8 +127,6 @@ private void inflateView(Context context, AttributeSet attrs) {
 
         DividerItemDecoration itemDecoration = new DividerItemDecoration(recyclerView.getContext(),
                 layoutManager.getOrientation());
-        int dividerColor = ResourcesCompat.getColor(getResources(), R.color.snabble_dividerColor, null);
-        itemDecoration.setDrawable(new ColorDrawable(dividerColor));
         recyclerView.addItemDecoration(itemDecoration);
 
         coordinatorLayout = findViewById(R.id.coordinator_layout);
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutStatusView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutStatusView.java
@@ -24,13 +24,9 @@
 import io.snabble.sdk.ui.telemetry.Telemetry;
 
 class CheckoutStatusView extends FrameLayout implements Checkout.OnCheckoutStateChangedListener {
-    private ViewGroup[] steps;
-    private int currentStep;
     private Checkout checkout;
     private BarcodeView checkoutIdCode;
 
-    private Handler handler = new Handler(Looper.getMainLooper());
-
     public CheckoutStatusView(Context context) {
         super(context);
         inflateView();
@@ -48,12 +44,6 @@ public CheckoutStatusView(Context context, AttributeSet attrs, int defStyleAttr)
 
     private void inflateView() {
         inflate(getContext(), R.layout.view_checkout_status, this);
-        currentStep = 0;
-
-        steps = new ViewGroup[3];
-        steps[0] = findViewById(R.id.step1);
-        steps[1] = findViewById(R.id.step2);
-        steps[2] = findViewById(R.id.step3);
 
         checkoutIdCode = findViewById(R.id.checkout_id_code);
 
@@ -71,68 +61,14 @@ public void onClick(View v) {
             }
         });
 
-        for(View v : steps) {
-            ImageView imageView = v.findViewWithTag("image");
-            ProgressBar progressBar = v.findViewWithTag("progress");
-
-            int color = 0x1d1f2440;
-            progressBar.getIndeterminateDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-            progressBar.getProgressDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-            progressBar.setIndeterminate(false);
-            progressBar.setProgress(0);
-
-            // tinting the white backgrounded images with the background color
-            // so they appear seamless
-            ImageViewCompat.setImageTintMode(imageView, PorterDuff.Mode.MULTIPLY);
-            TypedValue a = new TypedValue();
-            getContext().getTheme().resolveAttribute(android.R.attr.windowBackground, a, true);
-            if (a.type >= TypedValue.TYPE_FIRST_COLOR_INT && a.type <= TypedValue.TYPE_LAST_COLOR_INT) {
-                ImageViewCompat.setImageTintList(imageView, ColorStateList.valueOf(a.data));
-            }
-        }
-
         if (SnabbleUI.getActionBar() != null) {
-            SnabbleUI.getActionBar().setTitle(R.string.Snabble_Checkout_verifying);
+            SnabbleUI.getActionBar().setTitle(R.string.Snabble_Payment_confirm);
         }
 
         checkout = SnabbleUI.getProject().getCheckout();
         onStateChanged(checkout.getState());
     }
 
-    private void setStep(int step) {
-        currentStep = step;
-
-        if (currentStep < steps.length) {
-            crossFade(steps[currentStep]);
-
-            int nextStep = currentStep + 1;
-            if (nextStep < steps.length) {
-                ProgressBar progressBar = steps[nextStep].findViewWithTag("progress");
-                progressBar.setIndeterminate(true);
-            }
-        }
-    }
-
-    private void crossFade(final ViewGroup vg) {
-        ImageView imageView = vg.findViewWithTag("image");
-        ImageView imageView2 = vg.findViewWithTag("image_ok");
-        ProgressBar progressBar = vg.findViewWithTag("progress");
-
-        imageView.animate()
-                .alpha(0f)
-                .setInterpolator(new AccelerateDecelerateInterpolator())
-                .setDuration(500)
-                .start();
-
-        imageView2.animate()
-                .alpha(1f)
-                .setInterpolator(new AccelerateDecelerateInterpolator())
-                .setDuration(500)
-                .start();
-
-        progressBar.setVisibility(View.INVISIBLE);
-    }
-
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -159,17 +95,6 @@ public void onStateChanged(Checkout.State state) {
                 if (id != null) {
                     checkoutIdCode.setText(id);
                 }
-                setStep(0);
-                break;
-            case PAYMENT_APPROVED:
-                setStep(1);
-                Telemetry.event(Telemetry.Event.CheckoutSuccessful);
-                handler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        setStep(2);
-                    }
-                }, 1000);
                 break;
             case DENIED_BY_PAYMENT_PROVIDER:
                 Telemetry.event(Telemetry.Event.CheckoutDeniedByPaymentProvider);
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
@@ -63,8 +63,6 @@ private void inflateView() {
         recyclerView.setItemAnimator(null);
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL);
-        int dividerColor = ResourcesCompat.getColor(getResources(), R.color.snabble_dividerColor, null);
-        dividerItemDecoration.setDrawable(new ColorDrawable(dividerColor));
         recyclerView.addItemDecoration(dividerItemDecoration);
 
         View fab = findViewById(R.id.fab);
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsSelectView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsSelectView.java
@@ -69,8 +69,6 @@ public void click() {
         recyclerView.setItemAnimator(null);
 
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL);
-        int dividerColor = ResourcesCompat.getColor(getResources(), R.color.snabble_dividerColor, null);
-        dividerItemDecoration.setDrawable(new ColorDrawable(dividerColor));
         recyclerView.addItemDecoration(dividerItemDecoration);
     }
 
diff --git a/ui/src/main/res/layout/item_bundle_select.xml b/ui/src/main/res/layout/item_bundle_select.xml
@@ -12,7 +12,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/snabble_dividerColor" />
+        android:background="?android:attr/listDivider" />
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/ui/src/main/res/layout/view_checkout_status.xml b/ui/src/main/res/layout/view_checkout_status.xml
@@ -5,177 +5,57 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.flexbox.FlexboxLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/bottom_container"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        app:flexDirection="column"
-        app:justifyContent="center"
-        app:flexWrap="nowrap">
-        <FrameLayout
-            android:id="@+id/step1"
+        android:orientation="vertical"
+        android:gravity="center">
+        <io.snabble.sdk.ui.scanner.BarcodeView
+            android:id="@+id/checkout_id_code"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            app:layout_maxHeight="80dp"
-            app:layout_flexGrow="1">
-
-            <ProgressBar
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="4dp"
-                android:tag="progress" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:adjustViewBounds="true"
-                android:layout_gravity="bottom|center_horizontal"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_verify_1"
-                android:tag="image" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:adjustViewBounds="true"
-                android:layout_gravity="bottom|center_horizontal"
-                android:alpha="0"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_verify_ok"
-                android:tag="image_ok" />
-        </FrameLayout>
+            android:layout_height="168dp"
+            android:background="?android:attr/windowBackground"
+            app:format="DATA_MATRIX"
+            tools:ignore="RtlHardcoded" />
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            app:layout_maxHeight="48dp"
-            app:layout_flexGrow="0.5"
-            android:gravity="center"
-            android:text="@string/Snabble.PaymentStatus.step1"
-            android:textSize="15sp" />
-
-        <FrameLayout
-            android:id="@+id/step2"
+            android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            app:layout_maxHeight="80dp"
-            app:layout_flexGrow="1">
-
-            <ProgressBar
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="4dp"
-                android:tag="progress" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:adjustViewBounds="true"
-                android:layout_gravity="bottom|center_horizontal"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_verify_2"
-                android:tag="image" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:adjustViewBounds="true"
-                android:layout_gravity="bottom|center_horizontal"
-                android:alpha="0"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_verify_ok"
-                android:tag="image_ok" />
-        </FrameLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            app:layout_maxHeight="48dp"
-            app:layout_flexGrow="0.5"
+            android:layout_gravity="center"
             android:gravity="center"
-            android:text="@string/Snabble.PaymentStatus.step2"
-            android:textSize="15sp" />
-
-        <FrameLayout
-            android:id="@+id/step3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            app:layout_maxHeight="80dp"
-            app:layout_flexGrow="1">
-
-            <ProgressBar
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="4dp"
-                android:tag="progress" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:adjustViewBounds="true"
-                android:layout_gravity="bottom|center_horizontal"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_verify_3"
-                android:tag="image" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="bottom|center_horizontal"
-                android:alpha="0"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_verify_ok"
-                android:tag="image_ok" />
-        </FrameLayout>
+            android:padding="16dp"
+            android:text="@string/Snabble.Payment.presentCode"
+            android:textSize="17sp" />
 
-        <TextView
+        <ProgressBar
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            app:layout_maxHeight="48dp"
-            app:layout_flexGrow="0.5"
-            android:gravity="center"
-            android:text="@string/Snabble.PaymentStatus.step3"
-            android:textSize="15sp" />
-    </com.google.android.flexbox.FlexboxLayout>
-
-    <FrameLayout
-        android:id="@+id/bottom_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true">
+            android:layout_marginTop="16dp"
+            android:indeterminate="true"/>
 
         <TextView
-            android:id="@+id/cancel"
+            android:id="@+id/waiting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
-            android:padding="16dp"
-            android:text="@string/Snabble.Cancel"
-            android:textColor="@color/snabble_primaryColor"
+            android:paddingTop="4dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:text="@string/Snabble.Payment.waiting"
             android:textSize="17sp" />
+    </LinearLayout>
 
-        <io.snabble.sdk.ui.scanner.BarcodeView
-            android:id="@+id/checkout_id_code"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_gravity="right"
-            android:padding="8dp"
-            app:format="DATA_MATRIX"
-            tools:ignore="RtlHardcoded" />
-    </FrameLayout>
+    <TextView
+        android:id="@+id/cancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/Snabble.Cancel"
+        android:textColor="@color/snabble_primaryColor"
+        android:textSize="17sp" />
 </RelativeLayout>
diff --git a/ui/src/main/res/values/colors.xml b/ui/src/main/res/values/colors.xml
@@ -13,7 +13,6 @@
     <color name="snabble_textColorDark">#1D1F24</color>
     <color name="snabble_textColorAction">@color/snabble_primaryColor</color>
     <color name="snabble_textColorError">#ff0000</color>
-    <color name="snabble_dividerColor">#D8D8D8</color>
     <color name="snabble_backgroundColorDark">#0d0d0d</color>
     <color name="snabble_black">#1D1F24</color>
 </resources>
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.12.1'`
	`26`	`+ sdkVersion='0.12.2'`
`27`	`27`	`versionCode=1`
`28`	`28`
`29`	`29`	`compileSdkVersion=28`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,6 @@ public void click() {`
`69`	`69`	`recyclerView.setItemAnimator(null);`
`70`	`70`
`71`	`71`	`DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL);`
`72`		`- int dividerColor = ResourcesCompat.getColor(getResources(), R.color.snabble_dividerColor, null);`
`73`		`- dividerItemDecoration.setDrawable(new ColorDrawable(dividerColor));`
`74`	`72`	`recyclerView.addItemDecoration(dividerItemDecoration);`
`75`	`73`	`}`
`76`	`74`