Commit 10852380 authored by Skylot's avatar Skylot

res: don't use system locale for number formating (#238)

parent 1356d914
...@@ -6,6 +6,7 @@ import java.io.InputStream; ...@@ -6,6 +6,7 @@ import java.io.InputStream;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
...@@ -86,7 +87,7 @@ public class ValuesParser extends ParserConstants { ...@@ -86,7 +87,7 @@ public class ValuesParser extends ParserConstants {
case TYPE_INT_BOOLEAN: case TYPE_INT_BOOLEAN:
return data == 0 ? "false" : "true"; return data == 0 ? "false" : "true";
case TYPE_FLOAT: case TYPE_FLOAT:
return Float.toString(Float.intBitsToFloat(data)); return floatToString(Float.intBitsToFloat(data));
case TYPE_INT_COLOR_ARGB8: case TYPE_INT_COLOR_ARGB8:
return String.format("#%08x", data); return String.format("#%08x", data);
...@@ -207,12 +208,16 @@ public class ValuesParser extends ParserConstants { ...@@ -207,12 +208,16 @@ public class ValuesParser extends ParserConstants {
return Integer.toString((int) value); return Integer.toString((int) value);
} }
// remove trailing zeroes // remove trailing zeroes
NumberFormat f = NumberFormat.getInstance(); NumberFormat f = NumberFormat.getInstance(Locale.ROOT);
f.setMaximumFractionDigits(4); f.setMaximumFractionDigits(4);
f.setMinimumIntegerDigits(1); f.setMinimumIntegerDigits(1);
return f.format(value); return f.format(value);
} }
private static String floatToString(float value) {
return doubleToString((double) value);
}
public static Map<Integer, String> getAndroidResMap() { public static Map<Integer, String> getAndroidResMap() {
return androidResMap; return androidResMap;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment