X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=c0f4cebaf81c7491185fd6cc7fbd2657727904e7;hb=65a96105664ccb11f4332e2ddde5758befc7e498;hp=f0f3987789e56673285923eee2209dc915d10b13;hpb=8ca38438602c8addcbce91167d467e6da0ba962b;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/model/Data.java b/app/src/main/java/net/ktnx/mobileledger/model/Data.java index f0f39877..c0f4ceba 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -35,6 +35,8 @@ import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.ObservableValue; import java.text.NumberFormat; +import java.text.ParseException; +import java.text.ParsePosition; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -67,6 +69,7 @@ public final class Data { new InertMutableLiveData<>(); private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0); private static final Locker profilesLocker = new Locker(); + private static NumberFormat numberFormatter; static { locale.setValue(Locale.getDefault()); @@ -189,8 +192,23 @@ public final class Data { } else currencySymbolPosition.setValue(Currency.Position.none); - } + NumberFormat newNumberFormatter = NumberFormat.getNumberInstance(); + newNumberFormatter.setParseIntegerOnly(false); + newNumberFormatter.setGroupingUsed(true); + newNumberFormatter.setGroupingUsed(true); + newNumberFormatter.setMinimumIntegerDigits(1); + newNumberFormatter.setMinimumFractionDigits(2); + + numberFormatter = newNumberFormatter; + } + public static String formatCurrency(float number) { + NumberFormat formatter = NumberFormat.getCurrencyInstance(locale.getValue()); + return formatter.format(number); + } + public static String formatNumber(float number) { + return numberFormatter.format(number); + } public static void observeProfile(LifecycleOwner lifecycleOwner, Observer observer) { profile.observe(lifecycleOwner, observer); @@ -211,4 +229,12 @@ public final class Data { public static void removeProfileObservers(LifecycleOwner owner) { profile.removeObservers(owner); } + public static float parseNumber(String str) throws ParseException { + ParsePosition pos = new ParsePosition(0); + Number parsed = numberFormatter.parse(str); + if (parsed == null || pos.getErrorIndex() > -1) + throw new ParseException("Error parsing '" + str + "'", pos.getErrorIndex()); + + return parsed.floatValue(); + } } \ No newline at end of file