diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-16 14:16:00 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-12-19 14:10:32 +0100 |
| commit | 6b3082a981006b1fd7821fc9cac276037c75a5f1 (patch) | |
| tree | bb06eaa4e6aaa27b8a4bc4b811e7a53f8a9519fb | |
| parent | 5449ef39df9912ba191f7c27152bac8775d2f290 (diff) | |
| download | qtlocation-mapboxgl-6b3082a981006b1fd7821fc9cac276037c75a5f1.tar.gz | |
[android] use locale sensitive DecimalFormat for color alpha conversion
4 files changed, 9 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java index f180eda809..122349328f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java @@ -14,6 +14,7 @@ import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.exceptions.ConversionException; import java.text.DecimalFormat; +import java.text.NumberFormat; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -147,7 +148,10 @@ public class ColorUtils { * @return String rgba color */ public static String colorToRgbaString(@ColorInt int color) { - String alpha = new DecimalFormat("#.###").format(((float) ((color >> 24) & 0xFF)) / 255.0f); + NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US); + DecimalFormat decimalFormat = (DecimalFormat) numberFormat; + decimalFormat.applyPattern("#.###"); + String alpha = decimalFormat.format(((float) ((color >> 24) & 0xFF)) / 255.0f); return String.format(Locale.US, "rgba(%d, %d, %d, %s)", (color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, alpha); } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java index b2b41450b5..913c47fcd6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java @@ -1,8 +1,10 @@ package com.mapbox.mapboxsdk.maps; +import com.google.common.util.concurrent.ExecutionError; import com.mapbox.mapboxsdk.log.Logger; import com.mapbox.mapboxsdk.log.LoggerDefinition; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 2af9abac6c..86e4f4f5f8 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.1.4' classpath dependenciesList.licensesPlugin classpath dependenciesList.kotlinPlugin } diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index 9a7d4d7d27..1ebfd73849 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip |