2.3.2

Adyen · Feb 14, 2019 · 1718e08 · 1718e08
1 parent c21f4db
commit 1718e08
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ To give you as much flexibility as possible, our Android SDK can be integrated i
 Import the quick integration modules by adding these lines to your build.gradle file.
 
 ```groovy
-final checkoutVersion = "2.3.1"
+final checkoutVersion = "2.3.2"
 implementation "com.adyen.checkout:ui:${checkoutVersion}"
 implementation "com.adyen.checkout:nfc:${checkoutVersion}" // Optional; Integrates NFC card reader in card UI
 implementation "com.adyen.checkout:wechatpay:${checkoutVersion}" // Optional; Integrates support for WeChat Pay
@@ -136,7 +136,7 @@ By default, we use the font that is declared in the theme that is used for check
 #### Installation
 Import the following modules by adding these line to your `build.gradle` file.
 ```groovy
-final checkoutVersion = "2.3.1"
+final checkoutVersion = "2.3.2"
 implementation "com.adyen.checkout:core:${checkoutVersion}"
 implementation "com.adyen.checkout:core-card:${checkoutVersion}" // Optional; Required for processing card payments.
 implementation "com.adyen.checkout:nfc:${checkoutVersion}" // Optional; Enables reading of card information with the device"s NFC chip.

diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,8 @@ ext {
             "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:9a15154c07c05eadba8351c110647c1754316e32d8f12f55e24679891b52739c:SHA-256",
     ]
 
-    versionCode = 207
-    versionName = "2.3.1"
+    versionCode = 208
+    versionName = "2.3.2"
 
     testCoverageEnabled = true
 }

diff --git a/checkout-googlepay/src/main/java/com/adyen/checkout/googlepay/internal/GooglePayUtil.java b/checkout-googlepay/src/main/java/com/adyen/checkout/googlepay/internal/GooglePayUtil.java
@@ -34,12 +34,14 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 final class GooglePayUtil {
-    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("0.##");
+    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("0.##", new DecimalFormatSymbols(Locale.US));
 
     @NonNull
     static Task<Boolean> getIsReadyToPayTask(

diff --git a/checkout-ui/src/main/java/com/adyen/checkout/ui/internal/giropay/GiroPayDetailsActivity.java b/checkout-ui/src/main/java/com/adyen/checkout/ui/internal/giropay/GiroPayDetailsActivity.java
@@ -145,7 +145,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         mSelectedGiroPayIssuerViewHolder = TwoLineItemViewHolder.create(findViewById(android.R.id.content), R.id.item_two_line);
         Callable<Drawable> logoCallable = getLogoApi().newBuilder(mPaymentMethod).buildCallable();
         Rembrandt.createDefaultLogoRequestArgs(getApplication(), logoCallable).into(this, mSelectedGiroPayIssuerViewHolder.getLogoImageView());
-        mSelectedGiroPayIssuerViewHolder.getActionImageView().setImageResource(R.drawable.ic_clear_24dp);
+        mSelectedGiroPayIssuerViewHolder.getActionImageView().setImageResource(R.drawable.ic_primary_24dp);
         mSelectedGiroPayIssuerViewHolder.getActionImageView().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/checkout-ui/src/main/res/drawable/ic_primary_24dp.xml b/checkout-ui/src/main/res/drawable/ic_primary_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/colorPrimary"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/config/IDE/setup_ide.sh b/config/IDE/setup_ide.sh
@@ -17,7 +17,7 @@ then
   exit 0
 fi
 
-ANDROID_STUDIO_VERSION="3.2"
+ANDROID_STUDIO_VERSION="3.3"
 
 # Get the directory of the script file
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

diff --git a/example-app/src/main/java/com/adyen/example/model/request/LineItem.java b/example-app/src/main/java/com/adyen/example/model/request/LineItem.java
@@ -44,7 +44,7 @@ public final class LineItem implements Serializable {
     @Json(name = "taxCategory")
     private String mTaxCategory;
 
-    @Json(name = "mTaxPercentage")
+    @Json(name = "taxPercentage")
     private int mTaxPercentage;
 
     public LineItem(@NonNull String id, int amountIncludingTax) {